diff --git a/BWAPI4.exp b/BWAPI4.exp
index d42d5d3..50b11f3 100644
Binary files a/BWAPI4.exp and b/BWAPI4.exp differ
diff --git a/bwapi_bridge2_0.exp b/bwapi_bridge2_0.exp
new file mode 100644
index 0000000..0d67629
Binary files /dev/null and b/bwapi_bridge2_0.exp differ
diff --git a/bwapi_bridge_v2_0.exp b/bwapi_bridge_v2_0.exp
new file mode 100644
index 0000000..ed9a12b
Binary files /dev/null and b/bwapi_bridge_v2_0.exp differ
diff --git a/c4/impl.cpp b/c4/impl.cpp
index cd5a67f..4c56a6f 100644
--- a/c4/impl.cpp
+++ b/c4/impl.cpp
@@ -66,26 +66,26 @@ jfieldID FindCachedField(JNIEnv * env, jclass clz, string name, string signature
 using namespace BWAPI;
 
 PositionOrUnit convertPositionOrUnit(JNIEnv * env, jobject obj){ 
-	jclass clz = FindCachedClass(env, "bwapi4/PositionOrUnit");
+	jclass clz = FindCachedClass(env, "bwapi/PositionOrUnit");
 	jmethodID typeMethodId = FindCachedMethod(env, clz, "isUnit", "()Z");
 	bool isUnit = (bool)env->CallBooleanMethod(obj, typeMethodId);
 	if(isUnit){
-		jobject unitObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getUnit", "()Lbwapi4/Unit;"));
+		jobject unitObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getUnit", "()Lbwapi/Unit;"));
 		Unit unit = (Unit)env->GetLongField(unitObj, FindCachedField(env, env->GetObjectClass(unitObj), "pointer", "J"));
 		return PositionOrUnit(unit);
 	}
-	jobject posObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getPosition", "()Lbwapi4/Position;"));
+	jobject posObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getPosition", "()Lbwapi/Position;"));
 	Position position((int)env->GetIntField(posObj, FindCachedField(env, env->GetObjectClass(posObj), "x", "I")), (int)env->GetIntField(posObj, FindCachedField(env, env->GetObjectClass(posObj), "y", "I")));
 	return PositionOrUnit(position);
 }
 
 
-UnitCommand convertUnitCommand(JNIEnv * env, jobject obj){	jclass clz = FindCachedClass(env, "bwapi4/UnitCommand");
-	jobject unitObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getUnit", "()Lbwapi4/Unit;"));
+UnitCommand convertUnitCommand(JNIEnv * env, jobject obj){	jclass clz = FindCachedClass(env, "bwapi/UnitCommand");
+	jobject unitObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getUnit", "()Lbwapi/Unit;"));
 	Unit unit = (Unit)env->GetLongField(unitObj, FindCachedField(env, env->GetObjectClass(unitObj), "pointer", "J"));
-	jobject targetObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getTarget", "()Lbwapi4/Unit;"));
+	jobject targetObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getTarget", "()Lbwapi/Unit;"));
 	Unit target = (Unit)env->GetLongField(targetObj, FindCachedField(env, env->GetObjectClass(targetObj), "pointer", "J"));
-	jobject typeObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getUnitCommandType", "()Lbwapi4/UnitCommandType;"));
+	jobject typeObj = env->CallObjectMethod(obj, FindCachedMethod(env, clz, "getUnitCommandType", "()Lbwapi/UnitCommandType;"));
 	UnitCommandType type = *(UnitCommandType*)env->GetLongField(typeObj, FindCachedField(env, env->GetObjectClass(typeObj), "pointer", "J"));
 	int extra = (int)env->GetIntField(obj, FindCachedField(env, clz, "extra", "I"));
 	int x = (int)env->GetIntField(obj, FindCachedField(env, clz, "x", "I"));
@@ -103,728 +103,728 @@ int resolveUnitCommandExtra(UnitCommand& command){
 }
 
 
-JNIEXPORT jint JNICALL Java_bwapi4_Bullet_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Bullet_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 return x_bullet->getID();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Bullet_exists_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_exists_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 return x_bullet->exists();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 jlong resptr = (jlong)x_bullet->getPlayer();
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getType_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 jlong resptr = (jlong)x_bullet->getType();
-jclass retcls = FindCachedClass(env, "bwapi4/BulletType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/BulletType;");
+jclass retcls = FindCachedClass(env, "bwapi/BulletType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/BulletType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getSource_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getSource_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 jlong resptr = (jlong)x_bullet->getSource();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 Position cresult = x_bullet->getPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Bullet_getAngle_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getAngle_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 return x_bullet->getAngle();
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Bullet_getVelocityX_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getVelocityX_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 return x_bullet->getVelocityX();
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Bullet_getVelocityY_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getVelocityY_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 return x_bullet->getVelocityY();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getTarget_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getTarget_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 jlong resptr = (jlong)x_bullet->getTarget();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getTargetPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getTargetPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 Position cresult = x_bullet->getTargetPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Bullet_getRemoveTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Bullet_getRemoveTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 return x_bullet->getRemoveTimer();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Bullet_isVisible_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_isVisible_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Bullet x_bullet = (Bullet)pointer;
 return x_bullet->isVisible();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Bullet_isVisible_1native__JLbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_isVisible_1native__JLbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
 Bullet x_bullet = (Bullet)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_bullet->isVisible(player);
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_BulletType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_BulletType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 BulletType* x_bulletType = (BulletType*)pointer;
 return env->NewStringUTF(x_bulletType->toString().c_str());
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Client_isConnected_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Client_isConnected_1native(JNIEnv * env, jobject obj, jlong pointer){
 Client* x_client = (Client*)pointer;
 return x_client->isConnected();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Client_connect_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Client_connect_1native(JNIEnv * env, jobject obj, jlong pointer){
 Client* x_client = (Client*)pointer;
 return x_client->connect();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Client_disconnect_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Client_disconnect_1native(JNIEnv * env, jobject obj, jlong pointer){
 Client* x_client = (Client*)pointer;
 x_client->disconnect();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Client_update_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Client_update_1native(JNIEnv * env, jobject obj, jlong pointer){
 Client* x_client = (Client*)pointer;
 x_client->update();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_DamageType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_DamageType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 DamageType* x_damageType = (DamageType*)pointer;
 return env->NewStringUTF(x_damageType->toString().c_str());
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Error_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Error_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 Error* x_error = (Error*)pointer;
 return env->NewStringUTF(x_error->toString().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Event_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Event* x_evt = (Event*)pointer;
 Position cresult = x_evt->getPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Event_getText_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Event_getText_1native(JNIEnv * env, jobject obj, jlong pointer){
 Event* x_evt = (Event*)pointer;
 return env->NewStringUTF(x_evt->getText().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Event_getUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
 Event* x_evt = (Event*)pointer;
 jlong resptr = (jlong)x_evt->getUnit();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Event_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Event* x_evt = (Event*)pointer;
 jlong resptr = (jlong)x_evt->getPlayer();
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Event_isWinner_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Event_isWinner_1native(JNIEnv * env, jobject obj, jlong pointer){
 Event* x_evt = (Event*)pointer;
 return x_evt->isWinner();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_ExplosionType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_ExplosionType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 ExplosionType* x_explosionType = (ExplosionType*)pointer;
 return env->NewStringUTF(x_explosionType->toString().c_str());
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Force_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Force_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
 Force x_force = (Force)pointer;
 return x_force->getID();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Force_getName_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Force_getName_1native(JNIEnv * env, jobject obj, jlong pointer){
 Force x_force = (Force)pointer;
 return env->NewStringUTF(x_force->getName().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Force_getPlayers_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Force_getPlayers_1native(JNIEnv * env, jobject obj, jlong pointer){
 Force x_force = (Force)pointer;
 Playerset cresult = x_force->getPlayers();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Player");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Player;");
+jclass elemClass = FindCachedClass(env, "bwapi/Player");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Player;");
 for(Playerset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Player elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Forceset_getPlayers_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Forceset_getPlayers_1native(JNIEnv * env, jobject obj, jlong pointer){
 Forceset* x_forceset = (Forceset*)pointer;
 Playerset cresult = x_forceset->getPlayers();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Player");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Player;");
+jclass elemClass = FindCachedClass(env, "bwapi/Player");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Player;");
 for(Playerset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Player elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getForces_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getForces_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Forceset cresult = x_game->getForces();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Force");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Force;");
+jclass elemClass = FindCachedClass(env, "bwapi/Force");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Force;");
 for(Forceset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Force elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getPlayers_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getPlayers_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Playerset cresult = x_game->getPlayers();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Player");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Player;");
+jclass elemClass = FindCachedClass(env, "bwapi/Player");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Player;");
 for(Playerset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Player elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getAllUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getAllUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getAllUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getMinerals();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getGeysers_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getGeysers_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getGeysers();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getNeutralUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getNeutralUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getNeutralUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getStaticMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getStaticMinerals();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getStaticGeysers_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticGeysers_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getStaticGeysers();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getStaticNeutralUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticNeutralUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getStaticNeutralUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBullets_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBullets_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Bulletset cresult = x_game->getBullets();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Bullet");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Bullet;");
+jclass elemClass = FindCachedClass(env, "bwapi/Bullet");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Bullet;");
 for(Bulletset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Bullet elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getForce_1native(JNIEnv * env, jobject obj, jlong pointer, jint forceID){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getForce_1native(JNIEnv * env, jobject obj, jlong pointer, jint forceID){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->getForce(forceID);
-jclass retcls = FindCachedClass(env, "bwapi4/Force");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Force;");
+jclass retcls = FindCachedClass(env, "bwapi/Force");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Force;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer, jint playerID){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer, jint playerID){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->getPlayer(playerID);
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getUnit_1native(JNIEnv * env, jobject obj, jlong pointer, jint unitID){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getUnit_1native(JNIEnv * env, jobject obj, jlong pointer, jint unitID){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->getUnit(unitID);
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_indexToUnit_1native(JNIEnv * env, jobject obj, jlong pointer, jint unitIndex){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_indexToUnit_1native(JNIEnv * env, jobject obj, jlong pointer, jint unitIndex){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->indexToUnit(unitIndex);
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getRegion_1native(JNIEnv * env, jobject obj, jlong pointer, jint regionID){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegion_1native(JNIEnv * env, jobject obj, jlong pointer, jint regionID){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->getRegion(regionID);
-jclass retcls = FindCachedClass(env, "bwapi4/Region");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Region;");
+jclass retcls = FindCachedClass(env, "bwapi/Region");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Region;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getGameType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getGameType_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)tableGameType.find(x_game->getGameType())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/GameType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/GameType;");
+jclass retcls = FindCachedClass(env, "bwapi/GameType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/GameType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLatency_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatency_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getLatency();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getFrameCount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getFrameCount_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getFrameCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getReplayFrameCount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getReplayFrameCount_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getReplayFrameCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getFPS_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getFPS_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getFPS();
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Game_getAverageFPS_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_Game_getAverageFPS_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getAverageFPS();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getMousePosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getMousePosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Position cresult = x_game->getMousePosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_getMouseState_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_button){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_getMouseState_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_button){
 Game* x_game = (Game*)pointer;
 MouseButton button = (MouseButton)(int)env->GetIntField(p_button, FindCachedField(env, env->GetObjectClass(p_button), "value", "I"));
 return x_game->getMouseState(button);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_getKeyState_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_key){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_getKeyState_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_key){
 Game* x_game = (Game*)pointer;
 Key key = (Key)(int)env->GetIntField(p_key, FindCachedField(env, env->GetObjectClass(p_key), "value", "I"));
 return x_game->getKeyState(key);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getScreenPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getScreenPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Position cresult = x_game->getScreenPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setScreenPosition_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
+JNIEXPORT void JNICALL Java_bwapi_Game_setScreenPosition_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
 Game* x_game = (Game*)pointer;
 x_game->setScreenPosition(x, y);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setScreenPosition_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p){
+JNIEXPORT void JNICALL Java_bwapi_Game_setScreenPosition_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 x_game->setScreenPosition(p);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_pingMinimap_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
+JNIEXPORT void JNICALL Java_bwapi_Game_pingMinimap_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
 Game* x_game = (Game*)pointer;
 x_game->pingMinimap(x, y);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_pingMinimap_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p){
+JNIEXPORT void JNICALL Java_bwapi_Game_pingMinimap_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 x_game->pingMinimap(p);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isFlagEnabled_1native(JNIEnv * env, jobject obj, jlong pointer, jint flag){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isFlagEnabled_1native(JNIEnv * env, jobject obj, jlong pointer, jint flag){
 Game* x_game = (Game*)pointer;
 return x_game->isFlagEnabled(flag);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_enableFlag_1native(JNIEnv * env, jobject obj, jlong pointer, jint flag){
+JNIEXPORT void JNICALL Java_bwapi_Game_enableFlag_1native(JNIEnv * env, jobject obj, jlong pointer, jint flag){
 Game* x_game = (Game*)pointer;
 x_game->enableFlag(flag);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getLastError_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getLastError_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)tableError.find(x_game->getLastError())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Error");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Error;");
+jclass retcls = FindCachedClass(env, "bwapi/Error");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Error;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setLastError_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setLastError_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->setLastError();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setLastError_1native__JLbwapi4_Error_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_e){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setLastError_1native__JLbwapi_Error_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_e){
 Game* x_game = (Game*)pointer;
 Error* e = (Error*)env->GetLongField(p_e, FindCachedField(env, env->GetObjectClass(p_e), "pointer", "J"));
 return x_game->setLastError(*e);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_mapWidth_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_mapWidth_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->mapWidth();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_mapHeight_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_mapHeight_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->mapHeight();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapFileName_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapFileName_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return env->NewStringUTF(x_game->mapFileName().c_str());
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapPathName_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapPathName_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return env->NewStringUTF(x_game->mapPathName().c_str());
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapName_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapName_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return env->NewStringUTF(x_game->mapName().c_str());
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapHash_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapHash_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return env->NewStringUTF(x_game->mapHash().c_str());
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isWalkable_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint walkX, jint walkY){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isWalkable_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint walkX, jint walkY){
 Game* x_game = (Game*)pointer;
 return x_game->isWalkable(walkX, walkY);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isWalkable_1native__JLbwapi4_WalkPosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isWalkable_1native__JLbwapi_WalkPosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 WalkPosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->isWalkable(position);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getGroundHeight_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getGroundHeight_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
 Game* x_game = (Game*)pointer;
 return x_game->getGroundHeight(tileX, tileY);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getGroundHeight_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getGroundHeight_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->getGroundHeight(position);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
 Game* x_game = (Game*)pointer;
 return x_game->isBuildable(tileX, tileY);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JIIZ(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jboolean includeBuildings){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JIIZ(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jboolean includeBuildings){
 Game* x_game = (Game*)pointer;
 return x_game->isBuildable(tileX, tileY, (bool)includeBuildings);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->isBuildable(position);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JLbwapi4_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jboolean includeBuildings){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JLbwapi_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jboolean includeBuildings){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->isBuildable(position, (bool)includeBuildings);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isVisible_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isVisible_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
 Game* x_game = (Game*)pointer;
 return x_game->isVisible(tileX, tileY);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isVisible_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isVisible_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->isVisible(position);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isExplored_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isExplored_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
 Game* x_game = (Game*)pointer;
 return x_game->isExplored(tileX, tileY);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isExplored_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isExplored_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->isExplored(position);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasCreep_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasCreep_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
 Game* x_game = (Game*)pointer;
 return x_game->hasCreep(tileX, tileY);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasCreep_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasCreep_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->hasCreep(position);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
 Game* x_game = (Game*)pointer;
 return x_game->hasPowerPrecise(x, y);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JIILbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_unitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JIILbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_unitType){
 Game* x_game = (Game*)pointer;
 UnitType* unitType = (UnitType*)env->GetLongField(p_unitType, FindCachedField(env, env->GetObjectClass(p_unitType), "pointer", "J"));
 return x_game->hasPowerPrecise(x, y, *unitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 Position position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->hasPowerPrecise(position);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JLbwapi4_Position_2Lbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_unitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JLbwapi_Position_2Lbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_unitType){
 Game* x_game = (Game*)pointer;
 Position position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 UnitType* unitType = (UnitType*)env->GetLongField(p_unitType, FindCachedField(env, env->GetObjectClass(p_unitType), "pointer", "J"));
 return x_game->hasPowerPrecise(position, *unitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY){
 Game* x_game = (Game*)pointer;
 return x_game->hasPower(tileX, tileY);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JIILbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jobject p_unitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIILbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jobject p_unitType){
 Game* x_game = (Game*)pointer;
 UnitType* unitType = (UnitType*)env->GetLongField(p_unitType, FindCachedField(env, env->GetObjectClass(p_unitType), "pointer", "J"));
 return x_game->hasPower(tileX, tileY, *unitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->hasPower(position);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_unitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_unitType){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 UnitType* unitType = (UnitType*)env->GetLongField(p_unitType, FindCachedField(env, env->GetObjectClass(p_unitType), "pointer", "J"));
 return x_game->hasPower(position, *unitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JIIII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jint tileWidth, jint tileHeight){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIIII(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jint tileWidth, jint tileHeight){
 Game* x_game = (Game*)pointer;
 return x_game->hasPower(tileX, tileY, tileWidth, tileHeight);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JIIIILbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jint tileWidth, jint tileHeight, jobject p_unitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIIIILbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jint tileX, jint tileY, jint tileWidth, jint tileHeight, jobject p_unitType){
 Game* x_game = (Game*)pointer;
 UnitType* unitType = (UnitType*)env->GetLongField(p_unitType, FindCachedField(env, env->GetObjectClass(p_unitType), "pointer", "J"));
 return x_game->hasPower(tileX, tileY, tileWidth, tileHeight, *unitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2II(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jint tileWidth, jint tileHeight){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2II(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jint tileWidth, jint tileHeight){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_game->hasPower(position, tileWidth, tileHeight);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2IILbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jint tileWidth, jint tileHeight, jobject p_unitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2IILbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jint tileWidth, jint tileHeight, jobject p_unitType){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 UnitType* unitType = (UnitType*)env->GetLongField(p_unitType, FindCachedField(env, env->GetObjectClass(p_unitType), "pointer", "J"));
 return x_game->hasPower(position, tileWidth, tileHeight, *unitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canBuildHere_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2Lbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_type, jobject p_builder){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2Lbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_type, jobject p_builder){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 Unit builder = (Unit)env->GetLongField(p_builder, FindCachedField(env, env->GetObjectClass(p_builder), "pointer", "J"));
 return x_game->canBuildHere(position, *type, builder);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canBuildHere_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_type){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_game->canBuildHere(position, *type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canBuildHere_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2Lbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_type, jobject p_builder, jboolean checkExplored){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2Lbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_position, jobject p_type, jobject p_builder, jboolean checkExplored){
 Game* x_game = (Game*)pointer;
 TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 Unit builder = (Unit)env->GetLongField(p_builder, FindCachedField(env, env->GetObjectClass(p_builder), "pointer", "J"));
 return x_game->canBuildHere(position, *type, builder, (bool)checkExplored);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canMake_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canMake_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Game* x_game = (Game*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_game->canMake(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canMake_1native__JLbwapi4_UnitType_2Lbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_builder){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canMake_1native__JLbwapi_UnitType_2Lbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_builder){
 Game* x_game = (Game*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 Unit builder = (Unit)env->GetLongField(p_builder, FindCachedField(env, env->GetObjectClass(p_builder), "pointer", "J"));
 return x_game->canMake(*type, builder);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canResearch_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2Lbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit){
 Game* x_game = (Game*)pointer;
 TechType* type = (TechType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_game->canResearch(*type, unit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canResearch_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Game* x_game = (Game*)pointer;
 TechType* type = (TechType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_game->canResearch(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canResearch_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2Lbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit, jboolean checkCanIssueCommandType){
 Game* x_game = (Game*)pointer;
 TechType* type = (TechType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_game->canResearch(*type, unit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canUpgrade_1native__JLbwapi4_UpgradeType_2Lbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2Lbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit){
 Game* x_game = (Game*)pointer;
 UpgradeType* type = (UpgradeType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_game->canUpgrade(*type, unit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canUpgrade_1native__JLbwapi4_UpgradeType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Game* x_game = (Game*)pointer;
 UpgradeType* type = (UpgradeType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_game->canUpgrade(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canUpgrade_1native__JLbwapi4_UpgradeType_2Lbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2Lbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_unit, jboolean checkCanIssueCommandType){
 Game* x_game = (Game*)pointer;
 UpgradeType* type = (UpgradeType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_game->canUpgrade(*type, unit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_printf_1native(JNIEnv * env, jobject obj, jlong pointer, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_printf_1native(JNIEnv * env, jobject obj, jlong pointer, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 x_game->printf(std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_sendText_1native(JNIEnv * env, jobject obj, jlong pointer, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_sendText_1native(JNIEnv * env, jobject obj, jlong pointer, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 x_game->sendText(std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_sendTextEx_1native(JNIEnv * env, jobject obj, jlong pointer, jboolean toAllies, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_sendTextEx_1native(JNIEnv * env, jobject obj, jlong pointer, jboolean toAllies, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 x_game->sendTextEx((bool)toAllies, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isInGame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isInGame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isInGame();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isMultiplayer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isMultiplayer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isMultiplayer();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBattleNet_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBattleNet_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isBattleNet();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isPaused_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isPaused_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isPaused();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isReplay_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isReplay_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isReplay();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_pauseGame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Game_pauseGame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 x_game->pauseGame();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_resumeGame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Game_resumeGame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 x_game->resumeGame();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_leaveGame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Game_leaveGame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 x_game->leaveGame();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_restartGame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Game_restartGame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 x_game->restartGame();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setLocalSpeed_1native(JNIEnv * env, jobject obj, jlong pointer, jint speed){
+JNIEXPORT void JNICALL Java_bwapi_Game_setLocalSpeed_1native(JNIEnv * env, jobject obj, jlong pointer, jint speed){
 Game* x_game = (Game*)pointer;
 x_game->setLocalSpeed(speed);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_issueCommand_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_units, jobject p_command){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_issueCommand_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_units, jobject p_command){
 Game* x_game = (Game*)pointer;
 Unitset units;
 jclass colClass = env->GetObjectClass(p_units);
@@ -838,235 +838,235 @@ units.insert((Unit)env->GetLongField(jobj, FindCachedField(env, env->GetObjectCl
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_game->issueCommand(units, command);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getSelectedUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getSelectedUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Unitset cresult = x_game->getSelectedUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_self_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_self_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->self();
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_enemy_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_enemy_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->enemy();
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_neutral_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_neutral_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->neutral();
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_allies_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_allies_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Playerset cresult = x_game->allies();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Player");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Player;");
+jclass elemClass = FindCachedClass(env, "bwapi/Player");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Player;");
 for(Playerset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Player elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_enemies_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_enemies_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Playerset cresult = x_game->enemies();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Player");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Player;");
+jclass elemClass = FindCachedClass(env, "bwapi/Player");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Player;");
 for(Playerset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Player elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_observers_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_observers_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Playerset cresult = x_game->observers();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Player");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Player;");
+jclass elemClass = FindCachedClass(env, "bwapi/Player");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Player;");
 for(Playerset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Player elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setTextSize_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Game_setTextSize_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 x_game->setTextSize();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setTextSize_1native__JLbwapi4_Text_Size_Enum_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_size){
+JNIEXPORT void JNICALL Java_bwapi_Game_setTextSize_1native__JLbwapi_Text_Size_Enum_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_size){
 Game* x_game = (Game*)pointer;
 Text::Size::Enum size = (Text::Size::Enum)(int)env->GetIntField(p_size, FindCachedField(env, env->GetObjectClass(p_size), "value", "I"));
 x_game->setTextSize(size);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawText_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawText_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 x_game->drawText(ctype, x, y, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMap_1native__JIILjava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMap_1native__JIILjava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 x_game->drawTextMap(x, y, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMap_1native__JLbwapi4_Position_2Ljava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMap_1native__JLbwapi_Position_2Ljava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 x_game->drawTextMap(p, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMouse_1native__JIILjava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMouse_1native__JIILjava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 x_game->drawTextMouse(x, y, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMouse_1native__JLbwapi4_Position_2Ljava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMouse_1native__JLbwapi_Position_2Ljava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 x_game->drawTextMouse(p, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextScreen_1native__JIILjava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextScreen_1native__JIILjava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 x_game->drawTextScreen(x, y, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextScreen_1native__JLbwapi4_Position_2Ljava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jstring cstr_format){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextScreen_1native__JLbwapi_Position_2Ljava_lang_String_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jstring cstr_format){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 x_game->drawTextScreen(p, std::string(env->GetStringUTFChars(cstr_format, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBox_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint left, jint top, jint right, jint bottom, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBox_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint left, jint top, jint right, jint bottom, jobject p_color){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBox(ctype, left, top, right, bottom, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBox_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBox_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBox(ctype, left, top, right, bottom, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMap(left, top, right, bottom, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMap(left, top, right, bottom, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position leftTop((int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "x", "I")), (int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "y", "I")));
 Position rightBottom((int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "x", "I")), (int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMap(leftTop, rightBottom, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position leftTop((int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "x", "I")), (int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "y", "I")));
 Position rightBottom((int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "x", "I")), (int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMap(leftTop, rightBottom, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMouse(left, top, right, bottom, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMouse(left, top, right, bottom, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position leftTop((int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "x", "I")), (int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "y", "I")));
 Position rightBottom((int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "x", "I")), (int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMouse(leftTop, rightBottom, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position leftTop((int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "x", "I")), (int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "y", "I")));
 Position rightBottom((int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "x", "I")), (int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxMouse(leftTop, rightBottom, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxScreen(left, top, right, bottom, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint left, jint top, jint right, jint bottom, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxScreen(left, top, right, bottom, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position leftTop((int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "x", "I")), (int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "y", "I")));
 Position rightBottom((int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "x", "I")), (int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxScreen(leftTop, rightBottom, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_leftTop, jobject p_rightBottom, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position leftTop((int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "x", "I")), (int)env->GetIntField(p_leftTop, FindCachedField(env, env->GetObjectClass(p_leftTop), "y", "I")));
 Position rightBottom((int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "x", "I")), (int)env->GetIntField(p_rightBottom, FindCachedField(env, env->GetObjectClass(p_rightBottom), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawBoxScreen(leftTop, rightBottom, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangle_1native__JLbwapi4_CoordinateType_Enum_2IIIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangle_1native__JLbwapi_CoordinateType_Enum_2IIIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangle(ctype, ax, ay, bx, by, cx, cy, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangle_1native__JLbwapi4_CoordinateType_Enum_2IIIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangle_1native__JLbwapi_CoordinateType_Enum_2IIIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangle(ctype, ax, ay, bx, by, cx, cy, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JIIIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JIIIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMap(ax, ay, bx, by, cx, cy, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JIIIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JIIIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMap(ax, ay, bx, by, cx, cy, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
@@ -1074,7 +1074,7 @@ Position c((int)env->GetIntField(p_c, FindCachedField(env, env->GetObjectClass(p
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMap(a, b, c, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
@@ -1082,17 +1082,17 @@ Position c((int)env->GetIntField(p_c, FindCachedField(env, env->GetObjectClass(p
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMap(a, b, c, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JIIIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JIIIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMouse(ax, ay, bx, by, cx, cy, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JIIIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JIIIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMouse(ax, ay, bx, by, cx, cy, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
@@ -1100,7 +1100,7 @@ Position c((int)env->GetIntField(p_c, FindCachedField(env, env->GetObjectClass(p
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMouse(a, b, c, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
@@ -1108,17 +1108,17 @@ Position c((int)env->GetIntField(p_c, FindCachedField(env, env->GetObjectClass(p
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleMouse(a, b, c, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JIIIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JIIIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleScreen(ax, ay, bx, by, cx, cy, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JIIIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JIIIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint ax, jint ay, jint bx, jint by, jint cx, jint cy, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleScreen(ax, ay, bx, by, cx, cy, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
@@ -1126,7 +1126,7 @@ Position c((int)env->GetIntField(p_c, FindCachedField(env, env->GetObjectClass(p
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleScreen(a, b, c, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_c, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
@@ -1134,432 +1134,432 @@ Position c((int)env->GetIntField(p_c, FindCachedField(env, env->GetObjectClass(p
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawTriangleScreen(a, b, c, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircle_1native__JLbwapi4_CoordinateType_Enum_2IIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint radius, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircle_1native__JLbwapi_CoordinateType_Enum_2IIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint radius, jobject p_color){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircle(ctype, x, y, radius, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircle_1native__JLbwapi4_CoordinateType_Enum_2IIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircle_1native__JLbwapi_CoordinateType_Enum_2IIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircle(ctype, x, y, radius, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMap(x, y, radius, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMap(x, y, radius, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JLbwapi4_Position_2ILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JLbwapi_Position_2ILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMap(p, radius, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JLbwapi4_Position_2ILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JLbwapi_Position_2ILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMap(p, radius, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMouse(x, y, radius, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMouse(x, y, radius, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JLbwapi4_Position_2ILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JLbwapi_Position_2ILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMouse(p, radius, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JLbwapi4_Position_2ILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JLbwapi_Position_2ILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleMouse(p, radius, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleScreen(x, y, radius, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint radius, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleScreen(x, y, radius, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JLbwapi4_Position_2ILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JLbwapi_Position_2ILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleScreen(p, radius, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JLbwapi4_Position_2ILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JLbwapi_Position_2ILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint radius, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawCircleScreen(p, radius, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipse_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint xrad, jint yrad, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipse_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint xrad, jint yrad, jobject p_color){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipse(ctype, x, y, xrad, yrad, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipse_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipse_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipse(ctype, x, y, xrad, yrad, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMap(x, y, xrad, yrad, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMap(x, y, xrad, yrad, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JLbwapi4_Position_2IILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JLbwapi_Position_2IILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMap(p, xrad, yrad, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JLbwapi4_Position_2IILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JLbwapi_Position_2IILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMap(p, xrad, yrad, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMouse(x, y, xrad, yrad, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMouse(x, y, xrad, yrad, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JLbwapi4_Position_2IILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JLbwapi_Position_2IILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMouse(p, xrad, yrad, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JLbwapi4_Position_2IILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JLbwapi_Position_2IILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseMouse(p, xrad, yrad, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseScreen(x, y, xrad, yrad, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JIIIILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JIIIILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseScreen(x, y, xrad, yrad, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JLbwapi4_Position_2IILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JLbwapi_Position_2IILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseScreen(p, xrad, yrad, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JLbwapi4_Position_2IILbwapi4_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JLbwapi_Position_2IILbwapi_Color_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jint xrad, jint yrad, jobject p_color, jboolean isSolid){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawEllipseScreen(p, xrad, yrad, color, (bool)isSolid);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDot_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDot_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x, jint y, jobject p_color){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawDot(ctype, x, y, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMap_1native__JIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMap_1native__JIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawDotMap(x, y, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMap_1native__JLbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMap_1native__JLbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawDotMap(p, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMouse_1native__JIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMouse_1native__JIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawDotMouse(x, y, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMouse_1native__JLbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMouse_1native__JLbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawDotMouse(p, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotScreen_1native__JIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotScreen_1native__JIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawDotScreen(x, y, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotScreen_1native__JLbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotScreen_1native__JLbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_p, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position p((int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "x", "I")), (int)env->GetIntField(p_p, FindCachedField(env, env->GetObjectClass(p_p), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawDotScreen(p, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLine_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x1, jint y1, jint x2, jint y2, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLine_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_ctype, jint x1, jint y1, jint x2, jint y2, jobject p_color){
 Game* x_game = (Game*)pointer;
 CoordinateType::Enum ctype = (CoordinateType::Enum)(int)env->GetIntField(p_ctype, FindCachedField(env, env->GetObjectClass(p_ctype), "value", "I"));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawLine(ctype, x1, y1, x2, y2, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMap_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x1, jint y1, jint x2, jint y2, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMap_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x1, jint y1, jint x2, jint y2, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawLineMap(x1, y1, x2, y2, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawLineMap(a, b, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMouse_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x1, jint y1, jint x2, jint y2, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMouse_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x1, jint y1, jint x2, jint y2, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawLineMouse(x1, y1, x2, y2, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawLineMouse(a, b, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineScreen_1native__JIIIILbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x1, jint y1, jint x2, jint y2, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineScreen_1native__JIIIILbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jint x1, jint y1, jint x2, jint y2, jobject p_color){
 Game* x_game = (Game*)pointer;
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawLineScreen(x1, y1, x2, y2, color);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_color){
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_a, jobject p_b, jobject p_color){
 Game* x_game = (Game*)pointer;
 Position a((int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "x", "I")), (int)env->GetIntField(p_a, FindCachedField(env, env->GetObjectClass(p_a), "y", "I")));
 Position b((int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "x", "I")), (int)env->GetIntField(p_b, FindCachedField(env, env->GetObjectClass(p_b), "y", "I")));
 Color color((int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "r", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "g", "I")), (int)env->GetIntField(p_color, FindCachedField(env, env->GetObjectClass(p_color), "b", "I")));
 x_game->drawLineScreen(a, b, color);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLatencyFrames_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatencyFrames_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getLatencyFrames();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLatencyTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatencyTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getLatencyTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getRemainingLatencyFrames_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRemainingLatencyFrames_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getRemainingLatencyFrames();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getRemainingLatencyTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRemainingLatencyTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getRemainingLatencyTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getRevision_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRevision_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getRevision();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isDebug_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isDebug_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isDebug();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isLatComEnabled_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isLatComEnabled_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isLatComEnabled();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setLatCom_1native(JNIEnv * env, jobject obj, jlong pointer, jboolean isEnabled){
+JNIEXPORT void JNICALL Java_bwapi_Game_setLatCom_1native(JNIEnv * env, jobject obj, jlong pointer, jboolean isEnabled){
 Game* x_game = (Game*)pointer;
 x_game->setLatCom((bool)isEnabled);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isGUIEnabled_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isGUIEnabled_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->isGUIEnabled();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setGUI_1native(JNIEnv * env, jobject obj, jlong pointer, jboolean enabled){
+JNIEXPORT void JNICALL Java_bwapi_Game_setGUI_1native(JNIEnv * env, jobject obj, jlong pointer, jboolean enabled){
 Game* x_game = (Game*)pointer;
 x_game->setGUI((bool)enabled);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getInstanceNumber_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getInstanceNumber_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getInstanceNumber();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getAPM_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getAPM_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getAPM();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getAPM_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean includeSelects){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getAPM_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean includeSelects){
 Game* x_game = (Game*)pointer;
 return x_game->getAPM((bool)includeSelects);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setMap_1native(JNIEnv * env, jobject obj, jlong pointer, jstring cstr_mapFileName){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setMap_1native(JNIEnv * env, jobject obj, jlong pointer, jstring cstr_mapFileName){
 Game* x_game = (Game*)pointer;
 return x_game->setMap(std::string(env->GetStringUTFChars(cstr_mapFileName, NULL)).c_str());
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setFrameSkip_1native(JNIEnv * env, jobject obj, jlong pointer, jint frameSkip){
+JNIEXPORT void JNICALL Java_bwapi_Game_setFrameSkip_1native(JNIEnv * env, jobject obj, jlong pointer, jint frameSkip){
 Game* x_game = (Game*)pointer;
 x_game->setFrameSkip(frameSkip);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPath_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_source, jobject p_destination){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPath_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_source, jobject p_destination){
 Game* x_game = (Game*)pointer;
 Position source((int)env->GetIntField(p_source, FindCachedField(env, env->GetObjectClass(p_source), "x", "I")), (int)env->GetIntField(p_source, FindCachedField(env, env->GetObjectClass(p_source), "y", "I")));
 Position destination((int)env->GetIntField(p_destination, FindCachedField(env, env->GetObjectClass(p_destination), "x", "I")), (int)env->GetIntField(p_destination, FindCachedField(env, env->GetObjectClass(p_destination), "y", "I")));
 return x_game->hasPath(source, destination);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setAlliance_1native__JLbwapi4_Player_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_player, jboolean allied){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_player, jboolean allied){
 Game* x_game = (Game*)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_game->setAlliance(player, (bool)allied);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setAlliance_1native__JLbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
 Game* x_game = (Game*)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_game->setAlliance(player);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setAlliance_1native__JLbwapi4_Player_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_player, jboolean allied, jboolean alliedVictory){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_player, jboolean allied, jboolean alliedVictory){
 Game* x_game = (Game*)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_game->setAlliance(player, (bool)allied, (bool)alliedVictory);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setVision_1native__JLbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setVision_1native__JLbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
 Game* x_game = (Game*)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_game->setVision(player);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setVision_1native__JLbwapi4_Player_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_player, jboolean enabled){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setVision_1native__JLbwapi_Player_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_player, jboolean enabled){
 Game* x_game = (Game*)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_game->setVision(player, (bool)enabled);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_elapsedTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_elapsedTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->elapsedTime();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Game_setCommandOptimizationLevel_1native(JNIEnv * env, jobject obj, jlong pointer, jint level){
+JNIEXPORT void JNICALL Java_bwapi_Game_setCommandOptimizationLevel_1native(JNIEnv * env, jobject obj, jlong pointer, jint level){
 Game* x_game = (Game*)pointer;
 x_game->setCommandOptimizationLevel(level);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_countdownTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_countdownTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->countdownTimer();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getAllRegions_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getAllRegions_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 Regionset cresult = x_game->getAllRegions();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Region");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Region;");
+jclass elemClass = FindCachedClass(env, "bwapi/Region");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Region;");
 for(Regionset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Region elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getRegionAt_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegionAt_1native__JII(JNIEnv * env, jobject obj, jlong pointer, jint x, jint y){
 Game* x_game = (Game*)pointer;
 jlong resptr = (jlong)x_game->getRegionAt(x, y);
-jclass retcls = FindCachedClass(env, "bwapi4/Region");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Region;");
+jclass retcls = FindCachedClass(env, "bwapi/Region");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Region;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getRegionAt_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegionAt_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_position){
 Game* x_game = (Game*)pointer;
 Position position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 jlong resptr = (jlong)x_game->getRegionAt(position);
-jclass retcls = FindCachedClass(env, "bwapi4/Region");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Region;");
+jclass retcls = FindCachedClass(env, "bwapi/Region");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Region;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLastEventTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLastEventTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->getLastEventTime();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setRevealAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setRevealAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Game* x_game = (Game*)pointer;
 return x_game->setRevealAll();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setRevealAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean reveal){
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setRevealAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean reveal){
 Game* x_game = (Game*)pointer;
 return x_game->setRevealAll((bool)reveal);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBuildLocation_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2I(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_desiredPosition, jint maxRange){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2I(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_desiredPosition, jint maxRange){
 Game* x_game = (Game*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 TilePosition desiredPosition((int)env->GetIntField(p_desiredPosition, FindCachedField(env, env->GetObjectClass(p_desiredPosition), "x", "I")), (int)env->GetIntField(p_desiredPosition, FindCachedField(env, env->GetObjectClass(p_desiredPosition), "y", "I")));
 TilePosition cresult = x_game->getBuildLocation(*type, desiredPosition, maxRange);
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBuildLocation_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_desiredPosition){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_desiredPosition){
 Game* x_game = (Game*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 TilePosition desiredPosition((int)env->GetIntField(p_desiredPosition, FindCachedField(env, env->GetObjectClass(p_desiredPosition), "x", "I")), (int)env->GetIntField(p_desiredPosition, FindCachedField(env, env->GetObjectClass(p_desiredPosition), "y", "I")));
 TilePosition cresult = x_game->getBuildLocation(*type, desiredPosition);
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBuildLocation_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2IZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_desiredPosition, jint maxRange, jboolean creep){
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2IZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_desiredPosition, jint maxRange, jboolean creep){
 Game* x_game = (Game*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 TilePosition desiredPosition((int)env->GetIntField(p_desiredPosition, FindCachedField(env, env->GetObjectClass(p_desiredPosition), "x", "I")), (int)env->GetIntField(p_desiredPosition, FindCachedField(env, env->GetObjectClass(p_desiredPosition), "y", "I")));
 TilePosition cresult = x_game->getBuildLocation(*type, desiredPosition, maxRange, (bool)creep);
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageFrom_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_fromType, jobject p_toType, jobject p_fromPlayer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_fromType, jobject p_toType, jobject p_fromPlayer){
 Game* x_game = (Game*)pointer;
 UnitType* fromType = (UnitType*)env->GetLongField(p_fromType, FindCachedField(env, env->GetObjectClass(p_fromType), "pointer", "J"));
 UnitType* toType = (UnitType*)env->GetLongField(p_toType, FindCachedField(env, env->GetObjectClass(p_toType), "pointer", "J"));
 Player fromPlayer = (Player)env->GetLongField(p_fromPlayer, FindCachedField(env, env->GetObjectClass(p_fromPlayer), "pointer", "J"));
 return x_game->getDamageFrom(*fromType, *toType, fromPlayer);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageFrom_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_fromType, jobject p_toType){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_fromType, jobject p_toType){
 Game* x_game = (Game*)pointer;
 UnitType* fromType = (UnitType*)env->GetLongField(p_fromType, FindCachedField(env, env->GetObjectClass(p_fromType), "pointer", "J"));
 UnitType* toType = (UnitType*)env->GetLongField(p_toType, FindCachedField(env, env->GetObjectClass(p_toType), "pointer", "J"));
 return x_game->getDamageFrom(*fromType, *toType);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageFrom_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2Lbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_fromType, jobject p_toType, jobject p_fromPlayer, jobject p_toPlayer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2Lbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_fromType, jobject p_toType, jobject p_fromPlayer, jobject p_toPlayer){
 Game* x_game = (Game*)pointer;
 UnitType* fromType = (UnitType*)env->GetLongField(p_fromType, FindCachedField(env, env->GetObjectClass(p_fromType), "pointer", "J"));
 UnitType* toType = (UnitType*)env->GetLongField(p_toType, FindCachedField(env, env->GetObjectClass(p_toType), "pointer", "J"));
@@ -1567,20 +1567,20 @@ Player fromPlayer = (Player)env->GetLongField(p_fromPlayer, FindCachedField(env,
 Player toPlayer = (Player)env->GetLongField(p_toPlayer, FindCachedField(env, env->GetObjectClass(p_toPlayer), "pointer", "J"));
 return x_game->getDamageFrom(*fromType, *toType, fromPlayer, toPlayer);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageTo_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_toType, jobject p_fromType, jobject p_toPlayer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_toType, jobject p_fromType, jobject p_toPlayer){
 Game* x_game = (Game*)pointer;
 UnitType* toType = (UnitType*)env->GetLongField(p_toType, FindCachedField(env, env->GetObjectClass(p_toType), "pointer", "J"));
 UnitType* fromType = (UnitType*)env->GetLongField(p_fromType, FindCachedField(env, env->GetObjectClass(p_fromType), "pointer", "J"));
 Player toPlayer = (Player)env->GetLongField(p_toPlayer, FindCachedField(env, env->GetObjectClass(p_toPlayer), "pointer", "J"));
 return x_game->getDamageTo(*toType, *fromType, toPlayer);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageTo_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_toType, jobject p_fromType){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_toType, jobject p_fromType){
 Game* x_game = (Game*)pointer;
 UnitType* toType = (UnitType*)env->GetLongField(p_toType, FindCachedField(env, env->GetObjectClass(p_toType), "pointer", "J"));
 UnitType* fromType = (UnitType*)env->GetLongField(p_fromType, FindCachedField(env, env->GetObjectClass(p_fromType), "pointer", "J"));
 return x_game->getDamageTo(*toType, *fromType);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageTo_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2Lbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_toType, jobject p_fromType, jobject p_toPlayer, jobject p_fromPlayer){
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2Lbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_toType, jobject p_fromType, jobject p_toPlayer, jobject p_fromPlayer){
 Game* x_game = (Game*)pointer;
 UnitType* toType = (UnitType*)env->GetLongField(p_toType, FindCachedField(env, env->GetObjectClass(p_toType), "pointer", "J"));
 UnitType* fromType = (UnitType*)env->GetLongField(p_fromType, FindCachedField(env, env->GetObjectClass(p_fromType), "pointer", "J"));
@@ -1588,4254 +1588,4239 @@ Player toPlayer = (Player)env->GetLongField(p_toPlayer, FindCachedField(env, env
 Player fromPlayer = (Player)env->GetLongField(p_fromPlayer, FindCachedField(env, env->GetObjectClass(p_fromPlayer), "pointer", "J"));
 return x_game->getDamageTo(*toType, *fromType, toPlayer, fromPlayer);
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_GameType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_GameType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 GameType* x_gameType = (GameType*)pointer;
 return env->NewStringUTF(x_gameType->toString().c_str());
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->getID();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Player_getName_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Player_getName_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return env->NewStringUTF(x_player->getName().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 Unitset cresult = x_player->getUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 jlong resptr = (jlong)tableRace.find(x_player->getRace())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Race");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Race;");
+jclass retcls = FindCachedClass(env, "bwapi/Race");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Race;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getType_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 jlong resptr = (jlong)tablePlayerType.find(x_player->getType())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/PlayerType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/PlayerType;");
+jclass retcls = FindCachedClass(env, "bwapi/PlayerType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/PlayerType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getForce_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getForce_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 jlong resptr = (jlong)x_player->getForce();
-jclass retcls = FindCachedClass(env, "bwapi4/Force");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Force;");
+jclass retcls = FindCachedClass(env, "bwapi/Force");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Force;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isAlly_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isAlly_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
 Player x_player = (Player)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_player->isAlly(player);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isEnemy_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isEnemy_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
 Player x_player = (Player)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_player->isEnemy(player);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isNeutral_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isNeutral_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->isNeutral();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getStartLocation_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getStartLocation_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 TilePosition cresult = x_player->getStartLocation();
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isVictorious_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isVictorious_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->isVictorious();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isDefeated_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isDefeated_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->isDefeated();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_leftGame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_leftGame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->leftGame();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_minerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_minerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->minerals();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_gas_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_gas_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->gas();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_gatheredMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_gatheredMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->gatheredMinerals();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_gatheredGas_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_gatheredGas_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->gatheredGas();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_repairedMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_repairedMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->repairedMinerals();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_repairedGas_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_repairedGas_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->repairedGas();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_refundedMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_refundedMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->refundedMinerals();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_refundedGas_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_refundedGas_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->refundedGas();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_spentMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_spentMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->spentMinerals();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_spentGas_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_spentGas_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->spentGas();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyTotal_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyTotal_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->supplyTotal();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyTotal_1native__JLbwapi4_Race_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_race){
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyTotal_1native__JLbwapi_Race_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_race){
 Player x_player = (Player)pointer;
 Race* race = (Race*)env->GetLongField(p_race, FindCachedField(env, env->GetObjectClass(p_race), "pointer", "J"));
 return x_player->supplyTotal(*race);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyUsed_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyUsed_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->supplyUsed();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyUsed_1native__JLbwapi4_Race_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_race){
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyUsed_1native__JLbwapi_Race_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_race){
 Player x_player = (Player)pointer;
 Race* race = (Race*)env->GetLongField(p_race, FindCachedField(env, env->GetObjectClass(p_race), "pointer", "J"));
 return x_player->supplyUsed(*race);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_allUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_allUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->allUnitCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_allUnitCount_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_allUnitCount_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->allUnitCount(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_visibleUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_visibleUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->visibleUnitCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_visibleUnitCount_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_visibleUnitCount_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->visibleUnitCount(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_completedUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_completedUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->completedUnitCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_completedUnitCount_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_completedUnitCount_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->completedUnitCount(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_incompleteUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_incompleteUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->incompleteUnitCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_incompleteUnitCount_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_incompleteUnitCount_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->incompleteUnitCount(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_deadUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_deadUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->deadUnitCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_deadUnitCount_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_deadUnitCount_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->deadUnitCount(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_killedUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_killedUnitCount_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->killedUnitCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_killedUnitCount_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_killedUnitCount_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->killedUnitCount(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getUpgradeLevel_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getUpgradeLevel_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
 Player x_player = (Player)pointer;
 UpgradeType* upgrade = (UpgradeType*)env->GetLongField(p_upgrade, FindCachedField(env, env->GetObjectClass(p_upgrade), "pointer", "J"));
 return x_player->getUpgradeLevel(*upgrade);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_hasResearched_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_hasResearched_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Player x_player = (Player)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_player->hasResearched(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isResearching_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isResearching_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Player x_player = (Player)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_player->isResearching(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isUpgrading_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isUpgrading_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
 Player x_player = (Player)pointer;
 UpgradeType* upgrade = (UpgradeType*)env->GetLongField(p_upgrade, FindCachedField(env, env->GetObjectClass(p_upgrade), "pointer", "J"));
 return x_player->isUpgrading(*upgrade);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getColor_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getColor_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 Color cresult = x_player->getColor();
-jclass retcls = FindCachedClass(env, "bwapi4/Color");
+jclass retcls = FindCachedClass(env, "bwapi/Color");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(III)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.red(), cresult.green(), cresult.blue());
 return result;
 }
-JNIEXPORT jchar JNICALL Java_bwapi4_Player_getTextColor_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jchar JNICALL Java_bwapi_Player_getTextColor_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->getTextColor();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_maxEnergy_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_maxEnergy_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->maxEnergy(*unit);
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Player_topSpeed_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jdouble JNICALL Java_bwapi_Player_topSpeed_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->topSpeed(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_weaponMaxRange_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_weapon){
+JNIEXPORT jint JNICALL Java_bwapi_Player_weaponMaxRange_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_weapon){
 Player x_player = (Player)pointer;
 WeaponType* weapon = (WeaponType*)env->GetLongField(p_weapon, FindCachedField(env, env->GetObjectClass(p_weapon), "pointer", "J"));
 return x_player->weaponMaxRange(*weapon);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_sightRange_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_sightRange_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->sightRange(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_weaponDamageCooldown_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_weaponDamageCooldown_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->weaponDamageCooldown(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_armor_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jint JNICALL Java_bwapi_Player_armor_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->armor(*unit);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_damage_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_wpn){
+JNIEXPORT jint JNICALL Java_bwapi_Player_damage_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_wpn){
 Player x_player = (Player)pointer;
 WeaponType* wpn = (WeaponType*)env->GetLongField(p_wpn, FindCachedField(env, env->GetObjectClass(p_wpn), "pointer", "J"));
 return x_player->damage(*wpn);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getUnitScore_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getUnitScore_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->getUnitScore();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getKillScore_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getKillScore_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->getKillScore();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getBuildingScore_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getBuildingScore_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->getBuildingScore();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getRazingScore_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getRazingScore_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->getRazingScore();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getCustomScore_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getCustomScore_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->getCustomScore();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isObserver_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isObserver_1native(JNIEnv * env, jobject obj, jlong pointer){
 Player x_player = (Player)pointer;
 return x_player->isObserver();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getMaxUpgradeLevel_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
+JNIEXPORT jint JNICALL Java_bwapi_Player_getMaxUpgradeLevel_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
 Player x_player = (Player)pointer;
 UpgradeType* upgrade = (UpgradeType*)env->GetLongField(p_upgrade, FindCachedField(env, env->GetObjectClass(p_upgrade), "pointer", "J"));
 return x_player->getMaxUpgradeLevel(*upgrade);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isResearchAvailable_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isResearchAvailable_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Player x_player = (Player)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_player->isResearchAvailable(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isUnitAvailable_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isUnitAvailable_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_unit){
 Player x_player = (Player)pointer;
 UnitType* unit = (UnitType*)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 return x_player->isUnitAvailable(*unit);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Playerset_getUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Playerset_getUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Playerset* x_playerset = (Playerset*)pointer;
 Unitset cresult = x_playerset->getUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT void JNICALL Java_bwapi4_Playerset_setAlliance_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean allies){
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean allies){
 Playerset* x_playerset = (Playerset*)pointer;
 x_playerset->setAlliance((bool)allies);
 }
-JNIEXPORT void JNICALL Java_bwapi4_Playerset_setAlliance_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Playerset* x_playerset = (Playerset*)pointer;
 x_playerset->setAlliance();
 }
-JNIEXPORT void JNICALL Java_bwapi4_Playerset_setAlliance_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean allies, jboolean alliedVictory){
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean allies, jboolean alliedVictory){
 Playerset* x_playerset = (Playerset*)pointer;
 x_playerset->setAlliance((bool)allies, (bool)alliedVictory);
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_PlayerType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_PlayerType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 PlayerType* x_playerType = (PlayerType*)pointer;
 return env->NewStringUTF(x_playerType->toString().c_str());
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_PlayerType_isLobbyType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_PlayerType_isLobbyType_1native(JNIEnv * env, jobject obj, jlong pointer){
 PlayerType* x_playerType = (PlayerType*)pointer;
 return x_playerType->isLobbyType();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_PlayerType_isGameType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_PlayerType_isGameType_1native(JNIEnv * env, jobject obj, jlong pointer){
 PlayerType* x_playerType = (PlayerType*)pointer;
 return x_playerType->isGameType();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Position_isValid(JNIEnv * env, jobject obj){
+JNIEXPORT jboolean JNICALL Java_bwapi_Position_isValid(JNIEnv * env, jobject obj){
 Position x_position((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 return x_position.isValid();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Position_makeValid(JNIEnv * env, jobject obj){
+JNIEXPORT jobject JNICALL Java_bwapi_Position_makeValid(JNIEnv * env, jobject obj){
 Position x_position((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 Position cresult = x_position.makeValid();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Position_getDistance(JNIEnv * env, jobject obj, jobject p_position){
-Position x_position((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
-Position position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
-return x_position.getDistance(position);
-}
-JNIEXPORT jint JNICALL Java_bwapi4_Position_getApproxDistance(JNIEnv * env, jobject obj, jobject p_position){
+JNIEXPORT jint JNICALL Java_bwapi_Position_getApproxDistance(JNIEnv * env, jobject obj, jobject p_position){
 Position x_position((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 Position position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_position.getApproxDistance(position);
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Position_getLength(JNIEnv * env, jobject obj){
+JNIEXPORT jdouble JNICALL Java_bwapi_Position_getLength(JNIEnv * env, jobject obj){
 Position x_position((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 return x_position.getLength();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_Race_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_Race_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 Race* x_race = (Race*)pointer;
 return env->NewStringUTF(x_race->toString().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getWorker_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getWorker_1native(JNIEnv * env, jobject obj, jlong pointer){
 Race* x_race = (Race*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_race->getWorker())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getCenter_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getCenter_1native(JNIEnv * env, jobject obj, jlong pointer){
 Race* x_race = (Race*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_race->getCenter())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getRefinery_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getRefinery_1native(JNIEnv * env, jobject obj, jlong pointer){
 Race* x_race = (Race*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_race->getRefinery())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getTransport_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getTransport_1native(JNIEnv * env, jobject obj, jlong pointer){
 Race* x_race = (Race*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_race->getTransport())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getSupplyProvider_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getSupplyProvider_1native(JNIEnv * env, jobject obj, jlong pointer){
 Race* x_race = (Race*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_race->getSupplyProvider())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->getID();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getRegionGroupID_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getRegionGroupID_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->getRegionGroupID();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getCenter_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getCenter_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 Position cresult = x_region->getCenter();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Region_isHigherGround_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Region_isHigherGround_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->isHigherGround();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getDefensePriority_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getDefensePriority_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->getDefensePriority();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Region_isAccessible_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Region_isAccessible_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->isAccessible();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getNeighbors_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getNeighbors_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 Regionset cresult = x_region->getNeighbors();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Region");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Region;");
+jclass elemClass = FindCachedClass(env, "bwapi/Region");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Region;");
 for(Regionset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Region elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsLeft_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsLeft_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->getBoundsLeft();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsTop_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsTop_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->getBoundsTop();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsRight_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsRight_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->getBoundsRight();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsBottom_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsBottom_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 return x_region->getBoundsBottom();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getClosestAccessibleRegion_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getClosestAccessibleRegion_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 jlong resptr = (jlong)x_region->getClosestAccessibleRegion();
-jclass retcls = FindCachedClass(env, "bwapi4/Region");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Region;");
+jclass retcls = FindCachedClass(env, "bwapi/Region");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Region;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getClosestInaccessibleRegion_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getClosestInaccessibleRegion_1native(JNIEnv * env, jobject obj, jlong pointer){
 Region x_region = (Region)pointer;
 jlong resptr = (jlong)x_region->getClosestInaccessibleRegion();
-jclass retcls = FindCachedClass(env, "bwapi4/Region");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Region;");
+jclass retcls = FindCachedClass(env, "bwapi/Region");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Region;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getDistance_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_other){
+JNIEXPORT jint JNICALL Java_bwapi_Region_getDistance_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_other){
 Region x_region = (Region)pointer;
 Region other = (Region)env->GetLongField(p_other, FindCachedField(env, env->GetObjectClass(p_other), "pointer", "J"));
 return x_region->getDistance(other);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Regionset_getCenter_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Regionset_getCenter_1native(JNIEnv * env, jobject obj, jlong pointer){
 Regionset* x_regionset = (Regionset*)pointer;
 Position cresult = x_regionset->getCenter();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_TechType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_TechType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 return env->NewStringUTF(x_techType->toString().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 jlong resptr = (jlong)tableRace.find(x_techType->getRace())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Race");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Race;");
+jclass retcls = FindCachedClass(env, "bwapi/Race");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Race;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_mineralPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_TechType_mineralPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 return x_techType->mineralPrice();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_gasPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_TechType_gasPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 return x_techType->gasPrice();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_researchTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_TechType_researchTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 return x_techType->researchTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_energyCost_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_TechType_energyCost_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 return x_techType->energyCost();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_whatResearches_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_whatResearches_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_techType->whatResearches())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_getWeapon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getWeapon_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 jlong resptr = (jlong)tableWeaponType.find(x_techType->getWeapon())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/WeaponType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/WeaponType;");
+jclass retcls = FindCachedClass(env, "bwapi/WeaponType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/WeaponType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_TechType_targetsUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_TechType_targetsUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 return x_techType->targetsUnit();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_TechType_targetsPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_TechType_targetsPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 return x_techType->targetsPosition();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_getOrder_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getOrder_1native(JNIEnv * env, jobject obj, jlong pointer){
 TechType* x_techType = (TechType*)pointer;
 jlong resptr = (jlong)tableOrder.find(x_techType->getOrder())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Order");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Order;");
+jclass retcls = FindCachedClass(env, "bwapi/Order");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Order;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_TilePosition_isValid(JNIEnv * env, jobject obj){
+JNIEXPORT jboolean JNICALL Java_bwapi_TilePosition_isValid(JNIEnv * env, jobject obj){
 TilePosition x_tilePosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 return x_tilePosition.isValid();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_TilePosition_makeValid(JNIEnv * env, jobject obj){
+JNIEXPORT jobject JNICALL Java_bwapi_TilePosition_makeValid(JNIEnv * env, jobject obj){
 TilePosition x_tilePosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 TilePosition cresult = x_tilePosition.makeValid();
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_TilePosition_getDistance(JNIEnv * env, jobject obj, jobject p_position){
-TilePosition x_tilePosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
-TilePosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
-return x_tilePosition.getDistance(position);
-}
-JNIEXPORT jdouble JNICALL Java_bwapi4_TilePosition_getLength(JNIEnv * env, jobject obj){
+JNIEXPORT jdouble JNICALL Java_bwapi_TilePosition_getLength(JNIEnv * env, jobject obj){
 TilePosition x_tilePosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 return x_tilePosition.getLength();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getID_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getID();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_exists_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_exists_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->exists();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getReplayID_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getReplayID_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getReplayID();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getPlayer();
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getType_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_unit->getType())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Position cresult = x_unit->getPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTilePosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTilePosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 TilePosition cresult = x_unit->getTilePosition();
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Unit_getAngle_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getAngle_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getAngle();
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Unit_getVelocityX_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getVelocityX_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getVelocityX();
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_Unit_getVelocityY_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getVelocityY_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getVelocityY();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getRegion_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRegion_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getRegion();
-jclass retcls = FindCachedClass(env, "bwapi4/Region");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Region;");
+jclass retcls = FindCachedClass(env, "bwapi/Region");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Region;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getLeft_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLeft_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getLeft();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getTop_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getTop_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getTop();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRight_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRight_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getRight();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getBottom_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getBottom_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getBottom();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getHitPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getHitPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getHitPoints();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getShields_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getShields_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getShields();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getEnergy_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getEnergy_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getEnergy();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getResources_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getResources_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getResources();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getResourceGroup_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getResourceGroup_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getResourceGroup();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getDistance_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDistance_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->getDistance(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_hasPath_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_hasPath_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->hasPath(target);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getLastCommandFrame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLastCommandFrame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getLastCommandFrame();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLastCommand_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLastCommand_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 UnitCommand cresult = x_unit->getLastCommand();
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLastAttackingPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLastAttackingPlayer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getLastAttackingPlayer();
-jclass retcls = FindCachedClass(env, "bwapi4/Player");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Player;");
+jclass retcls = FindCachedClass(env, "bwapi/Player");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Player;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInitialType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialType_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_unit->getInitialType())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInitialPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Position cresult = x_unit->getInitialPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInitialTilePosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialTilePosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 TilePosition cresult = x_unit->getInitialTilePosition();
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getInitialHitPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInitialHitPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getInitialHitPoints();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getInitialResources_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInitialResources_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getInitialResources();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getKillCount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getKillCount_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getKillCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getAcidSporeCount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getAcidSporeCount_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getAcidSporeCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getInterceptorCount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInterceptorCount_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getInterceptorCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getScarabCount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getScarabCount_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getScarabCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getSpiderMineCount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpiderMineCount_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getSpiderMineCount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getGroundWeaponCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getGroundWeaponCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getGroundWeaponCooldown();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getAirWeaponCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getAirWeaponCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getAirWeaponCooldown();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getSpellCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpellCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getSpellCooldown();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getDefenseMatrixPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDefenseMatrixPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getDefenseMatrixPoints();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getDefenseMatrixTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDefenseMatrixTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getDefenseMatrixTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getEnsnareTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getEnsnareTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getEnsnareTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getIrradiateTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getIrradiateTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getIrradiateTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getLockdownTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLockdownTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getLockdownTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getMaelstromTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getMaelstromTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getMaelstromTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getOrderTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getOrderTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getOrderTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getPlagueTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getPlagueTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getPlagueTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemoveTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemoveTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getRemoveTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getStasisTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getStasisTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getStasisTimer();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getStimTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getStimTimer_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getStimTimer();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getBuildType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getBuildType_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_unit->getBuildType())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTech_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTech_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)tableTechType.find(x_unit->getTech())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/TechType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/TechType;");
+jclass retcls = FindCachedClass(env, "bwapi/TechType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/TechType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)tableUpgradeType.find(x_unit->getUpgrade())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UpgradeType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UpgradeType;");
+jclass retcls = FindCachedClass(env, "bwapi/UpgradeType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UpgradeType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingBuildTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingBuildTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getRemainingBuildTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingTrainTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingTrainTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getRemainingTrainTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingResearchTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingResearchTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getRemainingResearchTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingUpgradeTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingUpgradeTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getRemainingUpgradeTime();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getBuildUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getBuildUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getBuildUnit();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTarget_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTarget_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getTarget();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTargetPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTargetPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Position cresult = x_unit->getTargetPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getOrder_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrder_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)tableOrder.find(x_unit->getOrder())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Order");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Order;");
+jclass retcls = FindCachedClass(env, "bwapi/Order");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Order;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getSecondaryOrder_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getSecondaryOrder_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)tableOrder.find(x_unit->getSecondaryOrder())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Order");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Order;");
+jclass retcls = FindCachedClass(env, "bwapi/Order");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Order;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getOrderTarget_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrderTarget_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getOrderTarget();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getOrderTargetPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrderTargetPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Position cresult = x_unit->getOrderTargetPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getRallyPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRallyPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Position cresult = x_unit->getRallyPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getRallyUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRallyUnit_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getRallyUnit();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getAddon();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getNydusExit_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getNydusExit_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getNydusExit();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getPowerUp_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPowerUp_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getPowerUp();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTransport_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTransport_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getTransport();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLoadedUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLoadedUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Unitset cresult = x_unit->getLoadedUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getSpaceRemaining_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpaceRemaining_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->getSpaceRemaining();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getCarrier_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getCarrier_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getCarrier();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInterceptors_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInterceptors_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Unitset cresult = x_unit->getInterceptors();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getHatchery_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getHatchery_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 jlong resptr = (jlong)x_unit->getHatchery();
-jclass retcls = FindCachedClass(env, "bwapi4/Unit");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Unit;");
+jclass retcls = FindCachedClass(env, "bwapi/Unit");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Unit;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLarva_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLarva_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 Unitset cresult = x_unit->getLarva();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_hasNuke_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_hasNuke_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->hasNuke();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isAccelerating_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAccelerating_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isAccelerating();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isAttacking_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAttacking_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isAttacking();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isAttackFrame_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAttackFrame_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isAttackFrame();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBeingConstructed_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingConstructed_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isBeingConstructed();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBeingGathered_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingGathered_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isBeingGathered();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBeingHealed_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingHealed_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isBeingHealed();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBlind_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBlind_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isBlind();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBraking_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBraking_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isBraking();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBurrowed_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBurrowed_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isBurrowed();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCarryingGas_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCarryingGas_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isCarryingGas();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCarryingMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCarryingMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isCarryingMinerals();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCloaked_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCloaked_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isCloaked();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCompleted_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCompleted_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isCompleted();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isConstructing_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isConstructing_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isConstructing();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isDefenseMatrixed_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isDefenseMatrixed_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isDefenseMatrixed();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isDetected_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isDetected_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isDetected();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isEnsnared_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isEnsnared_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isEnsnared();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isFlying_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isFlying_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isFlying();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isFollowing_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isFollowing_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isFollowing();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isGatheringGas_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isGatheringGas_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isGatheringGas();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isGatheringMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isGatheringMinerals_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isGatheringMinerals();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isHallucination_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isHallucination_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isHallucination();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isHoldingPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isHoldingPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isHoldingPosition();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isIdle_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isIdle_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isIdle();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isInterruptible_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInterruptible_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isInterruptible();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isInvincible_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInvincible_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isInvincible();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isInWeaponRange_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInWeaponRange_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->isInWeaponRange(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isIrradiated_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isIrradiated_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isIrradiated();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isLifted_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLifted_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isLifted();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isLoaded_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLoaded_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isLoaded();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isLockedDown_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLockedDown_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isLockedDown();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isMaelstrommed_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMaelstrommed_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isMaelstrommed();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isMorphing_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMorphing_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isMorphing();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isMoving_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMoving_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isMoving();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isParasited_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isParasited_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isParasited();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isPatrolling_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPatrolling_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isPatrolling();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isPlagued_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPlagued_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isPlagued();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isRepairing_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isRepairing_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isRepairing();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isResearching_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isResearching_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isResearching();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isSelected_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isSelected_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isSelected();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isSieged_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isSieged_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isSieged();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStartingAttack_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStartingAttack_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isStartingAttack();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStasised_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStasised_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isStasised();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStimmed_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStimmed_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isStimmed();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStuck_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStuck_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isStuck();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isTraining_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isTraining_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isTraining();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderAttack_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderAttack_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isUnderAttack();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderDarkSwarm_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderDarkSwarm_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isUnderDarkSwarm();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderDisruptionWeb_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderDisruptionWeb_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isUnderDisruptionWeb();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderStorm_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderStorm_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isUnderStorm();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isPowered_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPowered_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isPowered();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUpgrading_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUpgrading_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isUpgrading();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isVisible_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isVisible_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isVisible();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isVisible_1native__JLbwapi4_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isVisible_1native__JLbwapi_Player_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_player){
 Unit x_unit = (Unit)pointer;
 Player player = (Player)env->GetLongField(p_player, FindCachedField(env, env->GetObjectClass(p_player), "pointer", "J"));
 return x_unit->isVisible(player);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isTargetable_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isTargetable_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->isTargetable();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_issueCommand_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_issueCommand_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->issueCommand(command);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_attack_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_attack_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->attack(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_attack_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_attack_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->attack(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_build_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_build_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unit x_unit = (Unit)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->build(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_build_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_build_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_target){
 Unit x_unit = (Unit)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->build(*type, target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_buildAddon_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_buildAddon_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unit x_unit = (Unit)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->buildAddon(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_train_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_train_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->train();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_train_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_train_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unit x_unit = (Unit)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->train(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_morph_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_morph_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unit x_unit = (Unit)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->morph(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_research_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_research_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->research(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_upgrade_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_upgrade_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_upgrade){
 Unit x_unit = (Unit)pointer;
 UpgradeType* upgrade = (UpgradeType*)env->GetLongField(p_upgrade, FindCachedField(env, env->GetObjectClass(p_upgrade), "pointer", "J"));
 return x_unit->upgrade(*upgrade);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_setRallyPoint_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_setRallyPoint_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->setRallyPoint(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_move_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_move_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->move(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_move_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_move_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->move(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_patrol_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_patrol_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->patrol(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_patrol_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_patrol_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->patrol(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_holdPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_holdPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->holdPosition();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_holdPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_holdPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 return x_unit->holdPosition((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_stop_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_stop_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->stop();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_stop_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_stop_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 return x_unit->stop((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_follow_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_follow_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->follow(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_follow_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_follow_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->follow(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_gather_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_gather_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->gather(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_gather_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_gather_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->gather(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_returnCargo_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_returnCargo_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->returnCargo();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_returnCargo_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_returnCargo_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 return x_unit->returnCargo((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_repair_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_repair_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->repair(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_repair_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_repair_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->repair(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_burrow_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_burrow_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->burrow();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unburrow_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unburrow_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->unburrow();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cloak_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cloak_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->cloak();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_decloak_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_decloak_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->decloak();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_siege_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_siege_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->siege();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unsiege_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unsiege_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->unsiege();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_lift_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_lift_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->lift();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_land_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_land_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->land(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_load_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_load_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->load(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_load_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_load_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->load(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unload_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unload_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unit->unload(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->unloadAll();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 return x_unit->unloadAll((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->unloadAll(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->unloadAll(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_rightClick_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_rightClick_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->rightClick(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_rightClick_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_rightClick_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->rightClick(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_haltConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_haltConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->haltConstruction();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->cancelConstruction();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->cancelAddon();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->cancelTrain();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelTrain_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint slot){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelTrain_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint slot){
 Unit x_unit = (Unit)pointer;
 return x_unit->cancelTrain(slot);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelMorph_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelMorph_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->cancelMorph();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelResearch_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelResearch_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->cancelResearch();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->cancelUpgrade();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_useTech_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_useTech_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->useTech(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_useTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_useTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->useTech(*tech, target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_placeCOP_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_placeCOP_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->placeCOP(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommand(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanBuildUnitType, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommand(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanBuildUnitType, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommand(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanBuildUnitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommand(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommand(command, (bool)checkCanUseTechPositionOnPositions);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommand(command);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanBuildUnitType, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommand(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanBuildUnitType, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommandGrouped(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommandGrouped(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommandGrouped(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommandGrouped(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommandGrouped(command, (bool)checkCanUseTechPositionOnPositions);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommandGrouped(command);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_command, jboolean checkCanUseTechPositionOnPositions, jboolean checkCanUseTechUnitOnUnits, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unit->canIssueCommandGrouped(command, (bool)checkCanUseTechPositionOnPositions, (bool)checkCanUseTechUnitOnUnits, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCommand_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommand_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCommand();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCommandGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommandGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCommandGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCommandGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommandGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCommandGrouped((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandType_1native__JLbwapi4_UnitCommandType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandType_1native__JLbwapi_UnitCommandType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct){
 Unit x_unit = (Unit)pointer;
 UnitCommandType* ct = (UnitCommandType*)env->GetLongField(p_ct, FindCachedField(env, env->GetObjectClass(p_ct), "pointer", "J"));
 return x_unit->canIssueCommandType(*ct);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandType_1native__JLbwapi4_UnitCommandType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandType_1native__JLbwapi_UnitCommandType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitCommandType* ct = (UnitCommandType*)env->GetLongField(p_ct, FindCachedField(env, env->GetObjectClass(p_ct), "pointer", "J"));
 return x_unit->canIssueCommandType(*ct, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandTypeGrouped_1native__JLbwapi4_UnitCommandType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 UnitCommandType* ct = (UnitCommandType*)env->GetLongField(p_ct, FindCachedField(env, env->GetObjectClass(p_ct), "pointer", "J"));
 return x_unit->canIssueCommandTypeGrouped(*ct, (bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandTypeGrouped_1native__JLbwapi4_UnitCommandType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct){
 Unit x_unit = (Unit)pointer;
 UnitCommandType* ct = (UnitCommandType*)env->GetLongField(p_ct, FindCachedField(env, env->GetObjectClass(p_ct), "pointer", "J"));
 return x_unit->canIssueCommandTypeGrouped(*ct);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandTypeGrouped_1native__JLbwapi4_UnitCommandType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_ct, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitCommandType* ct = (UnitCommandType*)env->GetLongField(p_ct, FindCachedField(env, env->GetObjectClass(p_ct), "pointer", "J"));
 return x_unit->canIssueCommandTypeGrouped(*ct, (bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTargetUnit_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTargetUnit_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canTargetUnit(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTargetUnit_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTargetUnit_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canTargetUnit(targetUnit, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttack();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttack((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttack(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttack(target, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttack(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttack(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttackGrouped(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttackGrouped(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttackGrouped(target, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttackGrouped(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canAttackGrouped(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMove_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMove_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackMove();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMove_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMove_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackMove((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMoveGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackMoveGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMoveGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackMoveGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMoveGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackMoveGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackUnit();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackUnit((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnit(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnit(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnit(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnit(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackUnitGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackUnitGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canAttackUnitGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnitGrouped(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnitGrouped(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnitGrouped(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnitGrouped(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canAttackUnitGrouped(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canBuild();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canBuild((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canBuild(*uType, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canBuild(*uType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canBuild(*uType, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos, jboolean checkTargetUnitType, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos, jboolean checkTargetUnitType, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 TilePosition tilePos((int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "x", "I")), (int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "y", "I")));
 return x_unit->canBuild(*uType, tilePos, (bool)checkTargetUnitType, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos, jboolean checkTargetUnitType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos, jboolean checkTargetUnitType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 TilePosition tilePos((int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "x", "I")), (int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "y", "I")));
 return x_unit->canBuild(*uType, tilePos, (bool)checkTargetUnitType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 TilePosition tilePos((int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "x", "I")), (int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "y", "I")));
 return x_unit->canBuild(*uType, tilePos);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos, jboolean checkTargetUnitType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jobject p_tilePos, jboolean checkTargetUnitType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 TilePosition tilePos((int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "x", "I")), (int)env->GetIntField(p_tilePos, FindCachedField(env, env->GetObjectClass(p_tilePos), "y", "I")));
 return x_unit->canBuild(*uType, tilePos, (bool)checkTargetUnitType, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canBuildAddon();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canBuildAddon((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JLbwapi4_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canBuildAddon(*uType, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canBuildAddon(*uType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JLbwapi4_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canBuildAddon(*uType, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canTrain();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canTrain((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JLbwapi4_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canTrain(*uType, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canTrain(*uType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JLbwapi4_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canTrain(*uType, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canMorph();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canMorph((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JLbwapi4_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canMorph(*uType, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canMorph(*uType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JLbwapi4_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_uType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 UnitType* uType = (UnitType*)env->GetLongField(p_uType, FindCachedField(env, env->GetObjectClass(p_uType), "pointer", "J"));
 return x_unit->canMorph(*uType, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canResearch();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canResearch((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unit x_unit = (Unit)pointer;
 TechType* type = (TechType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->canResearch(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__JLbwapi4_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JLbwapi_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* type = (TechType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->canResearch(*type, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUpgrade();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUpgrade((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__JLbwapi4_UpgradeType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JLbwapi_UpgradeType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unit x_unit = (Unit)pointer;
 UpgradeType* type = (UpgradeType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->canUpgrade(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__JLbwapi4_UpgradeType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JLbwapi_UpgradeType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 UpgradeType* type = (UpgradeType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unit->canUpgrade(*type, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSetRallyPoint();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSetRallyPoint((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canSetRallyPoint(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canSetRallyPoint(target, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canSetRallyPoint(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canSetRallyPoint(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSetRallyPosition();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSetRallyPosition((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSetRallyUnit();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSetRallyUnit((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canSetRallyUnit(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canSetRallyUnit(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canSetRallyUnit(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canSetRallyUnit(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMove_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMove_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canMove();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMove_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMove_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canMove((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMoveGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canMoveGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMoveGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canMoveGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMoveGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canMoveGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrol_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrol_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canPatrol();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrol_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrol_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canPatrol((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrolGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canPatrolGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrolGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canPatrolGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrolGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canPatrolGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canFollow();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canFollow((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canFollow(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canFollow(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canFollow(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canFollow(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canGather();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canGather((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canGather(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canGather(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canGather(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canGather(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canReturnCargo_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canReturnCargo_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canReturnCargo();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canReturnCargo_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canReturnCargo_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canReturnCargo((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHoldPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHoldPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canHoldPosition();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHoldPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHoldPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canHoldPosition((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canStop_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canStop_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canStop();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canStop_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canStop_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canStop((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRepair();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRepair((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRepair(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRepair(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRepair(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRepair(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBurrow_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBurrow_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canBurrow();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBurrow_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBurrow_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canBurrow((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnburrow_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnburrow_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnburrow();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnburrow_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnburrow_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnburrow((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCloak_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCloak_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCloak();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCloak_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCloak_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCloak((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canDecloak_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canDecloak_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canDecloak();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canDecloak_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canDecloak_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canDecloak((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSiege_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSiege_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSiege();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSiege_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSiege_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canSiege((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnsiege_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnsiege_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnsiege();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnsiege_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnsiege_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnsiege((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLift_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLift_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canLift();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLift_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLift_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canLift((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canLand();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canLand((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JLbwapi4_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canLand(target, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canLand(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JLbwapi4_TilePosition_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canLand(target, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canLoad();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canLoad((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canLoad(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canLoad(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canLoad(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canLoad(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadWithOrWithoutTarget_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadWithOrWithoutTarget_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnloadWithOrWithoutTarget();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadWithOrWithoutTarget_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadWithOrWithoutTarget_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnloadWithOrWithoutTarget((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAtPosition_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Position targDropPos((int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "x", "I")), (int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "y", "I")));
 return x_unit->canUnloadAtPosition(targDropPos, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAtPosition_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos){
 Unit x_unit = (Unit)pointer;
 Position targDropPos((int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "x", "I")), (int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "y", "I")));
 return x_unit->canUnloadAtPosition(targDropPos);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAtPosition_1native__JLbwapi4_Position_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Position targDropPos((int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "x", "I")), (int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "y", "I")));
 return x_unit->canUnloadAtPosition(targDropPos, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnload();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnload((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkPosition, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkPosition, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUnload(targetUnit, (bool)checkCanTargetUnit, (bool)checkPosition, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkPosition){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkPosition){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUnload(targetUnit, (bool)checkCanTargetUnit, (bool)checkPosition);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUnload(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUnload(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkPosition, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkPosition, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUnload(targetUnit, (bool)checkCanTargetUnit, (bool)checkPosition, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnloadAll();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnloadAll((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnloadAllPosition();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUnloadAllPosition((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Position targDropPos((int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "x", "I")), (int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "y", "I")));
 return x_unit->canUnloadAllPosition(targDropPos, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos){
 Unit x_unit = (Unit)pointer;
 Position targDropPos((int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "x", "I")), (int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "y", "I")));
 return x_unit->canUnloadAllPosition(targDropPos);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JLbwapi4_Position_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targDropPos, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Position targDropPos((int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "x", "I")), (int)env->GetIntField(p_targDropPos, FindCachedField(env, env->GetObjectClass(p_targDropPos), "y", "I")));
 return x_unit->canUnloadAllPosition(targDropPos, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClick();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClick((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClick(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClick(target, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClick(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClick(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClickGrouped(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClickGrouped(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClickGrouped(target, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClickGrouped(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canRightClickGrouped(target, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickPosition();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickPosition((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPositionGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickPositionGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPositionGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickPositionGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPositionGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickPositionGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickUnit();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickUnit((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnit(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnit(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnit(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnit(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickUnitGrouped((bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickUnitGrouped();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JZZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canRightClickUnitGrouped((bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnitGrouped(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnitGrouped(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnitGrouped(targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnitGrouped(targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkCanIssueCommandType, jboolean checkCommandibilityGrouped, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canRightClickUnitGrouped(targetUnit, (bool)checkCanTargetUnit, (bool)checkCanIssueCommandType, (bool)checkCommandibilityGrouped, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHaltConstruction_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHaltConstruction_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canHaltConstruction();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHaltConstruction_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHaltConstruction_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canHaltConstruction((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelConstruction_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelConstruction_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelConstruction();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelConstruction_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelConstruction_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelConstruction((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelAddon_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelAddon_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelAddon();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelAddon_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelAddon_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelAddon((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelTrain();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrain_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrain_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelTrain((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelTrainSlot();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelTrainSlot((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JIZ(JNIEnv * env, jobject obj, jlong pointer, jint slot, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JIZ(JNIEnv * env, jobject obj, jlong pointer, jint slot, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelTrainSlot(slot, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint slot){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint slot){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelTrainSlot(slot);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JIZZ(JNIEnv * env, jobject obj, jlong pointer, jint slot, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JIZZ(JNIEnv * env, jobject obj, jlong pointer, jint slot, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelTrainSlot(slot, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelMorph_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelMorph_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelMorph();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelMorph_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelMorph_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelMorph((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelResearch_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelResearch_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelResearch();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelResearch_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelResearch_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelResearch((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelUpgrade_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelUpgrade_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelUpgrade();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelUpgrade_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelUpgrade_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canCancelUpgrade((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUseTechWithOrWithoutTarget();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canUseTechWithOrWithoutTarget((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi4_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechWithOrWithoutTarget(*tech, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechWithOrWithoutTarget(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi4_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechWithOrWithoutTarget(*tech, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit, jboolean checkTargetsType, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit, jboolean checkTargetsType, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canUseTech(*tech, target, (bool)checkCanTargetUnit, (bool)checkTargetsType, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit, jboolean checkTargetsType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit, jboolean checkTargetsType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canUseTech(*tech, target, (bool)checkCanTargetUnit, (bool)checkTargetsType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canUseTech(*tech, target, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canUseTech(*tech, target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTech(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit, jboolean checkTargetsType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkCanTargetUnit, jboolean checkTargetsType, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unit->canUseTech(*tech, target, (bool)checkCanTargetUnit, (bool)checkTargetsType, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithoutTarget_1native__JLbwapi4_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechWithoutTarget(*tech, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithoutTarget_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechWithoutTarget(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithoutTarget_1native__JLbwapi4_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechWithoutTarget(*tech, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkTargetsUnits, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkTargetsUnits, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech, targetUnit, (bool)checkCanTargetUnit, (bool)checkTargetsUnits, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkTargetsUnits){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkTargetsUnits){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech, targetUnit, (bool)checkCanTargetUnit, (bool)checkTargetsUnits);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech, targetUnit, (bool)checkCanTargetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech, targetUnit);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkTargetsUnits, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_targetUnit, jboolean checkCanTargetUnit, jboolean checkTargetsUnits, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Unit targetUnit = (Unit)env->GetLongField(p_targetUnit, FindCachedField(env, env->GetObjectClass(p_targetUnit), "pointer", "J"));
 return x_unit->canUseTechUnit(*tech, targetUnit, (bool)checkCanTargetUnit, (bool)checkTargetsUnits, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechPosition(*tech, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechPosition(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unit->canUseTechPosition(*tech, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkTargetsPositions, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkTargetsPositions, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canUseTechPosition(*tech, target, (bool)checkTargetsPositions, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkTargetsPositions){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkTargetsPositions){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canUseTechPosition(*tech, target, (bool)checkTargetsPositions);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canUseTechPosition(*tech, target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkTargetsPositions, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2ZZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target, jboolean checkTargetsPositions, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canUseTechPosition(*tech, target, (bool)checkTargetsPositions, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unit x_unit = (Unit)pointer;
 return x_unit->canPlaceCOP();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 return x_unit->canPlaceCOP((bool)checkCommandibility);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JLbwapi4_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canPlaceCOP(target, (bool)checkCanIssueCommandType);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JLbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canPlaceCOP(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JLbwapi4_TilePosition_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2ZZ(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean checkCanIssueCommandType, jboolean checkCommandibility){
 Unit x_unit = (Unit)pointer;
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unit->canPlaceCOP(target, (bool)checkCanIssueCommandType, (bool)checkCommandibility);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_attack__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_attack__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 UnitCommand cresult = UnitCommand::attack(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_attack__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_attack__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 UnitCommand cresult = UnitCommand::attack(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_build(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jobject p_type){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_build(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jobject p_type){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 UnitCommand cresult = UnitCommand::build(unit, target, *type);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_buildAddon(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_type){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_buildAddon(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_type){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 UnitCommand cresult = UnitCommand::buildAddon(unit, *type);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_train(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_type){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_train(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_type){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 UnitCommand cresult = UnitCommand::train(unit, *type);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_morph(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_type){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_morph(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_type){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 UnitCommand cresult = UnitCommand::morph(unit, *type);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_research(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_tech){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_research(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_tech){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 UnitCommand cresult = UnitCommand::research(unit, *tech);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_upgrade(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_upgrade){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_upgrade(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_upgrade){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UpgradeType* upgrade = (UpgradeType*)env->GetLongField(p_upgrade, FindCachedField(env, env->GetObjectClass(p_upgrade), "pointer", "J"));
 UnitCommand cresult = UnitCommand::upgrade(unit, *upgrade);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_setRallyPoint(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_setRallyPoint(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 UnitCommand cresult = UnitCommand::setRallyPoint(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_move__Lbwapi4_Unit_2Lbwapi4_Position_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_move__Lbwapi_Unit_2Lbwapi_Position_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::move(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_move__Lbwapi4_Unit_2Lbwapi4_Position_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_move__Lbwapi_Unit_2Lbwapi_Position_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::move(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_patrol__Lbwapi4_Unit_2Lbwapi4_Position_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_patrol__Lbwapi_Unit_2Lbwapi_Position_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::patrol(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_patrol__Lbwapi4_Unit_2Lbwapi4_Position_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_patrol__Lbwapi_Unit_2Lbwapi_Position_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::patrol(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_holdPosition__Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_holdPosition__Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::holdPosition(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_holdPosition__Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_holdPosition__Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::holdPosition(unit, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_stop__Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_stop__Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::stop(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_stop__Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_stop__Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::stop(unit, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_follow__Lbwapi4_Unit_2Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_follow__Lbwapi_Unit_2Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::follow(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_follow__Lbwapi4_Unit_2Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_follow__Lbwapi_Unit_2Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::follow(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_gather__Lbwapi4_Unit_2Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_gather__Lbwapi_Unit_2Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::gather(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_gather__Lbwapi4_Unit_2Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_gather__Lbwapi_Unit_2Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::gather(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_returnCargo__Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_returnCargo__Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::returnCargo(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_returnCargo__Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_returnCargo__Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::returnCargo(unit, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_repair__Lbwapi4_Unit_2Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_repair__Lbwapi_Unit_2Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::repair(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_repair__Lbwapi4_Unit_2Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_repair__Lbwapi_Unit_2Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::repair(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_burrow(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_burrow(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::burrow(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unburrow(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unburrow(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::unburrow(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cloak(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cloak(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cloak(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_decloak(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_decloak(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::decloak(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_siege(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_siege(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::siege(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unsiege(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unsiege(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::unsiege(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_lift(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_lift(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::lift(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_land(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_land(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::land(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_load__Lbwapi4_Unit_2Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_load__Lbwapi_Unit_2Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::load(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_load__Lbwapi4_Unit_2Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_load__Lbwapi_Unit_2Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::load(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unload(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unload(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 UnitCommand cresult = UnitCommand::unload(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::unloadAll(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::unloadAll(unit, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2Lbwapi4_Position_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Lbwapi_Position_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::unloadAll(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2Lbwapi4_Position_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Lbwapi_Position_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::unloadAll(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_rightClick__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_rightClick__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 UnitCommand cresult = UnitCommand::rightClick(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_rightClick__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_rightClick__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2Z(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target, jboolean shiftQueueCommand){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 UnitCommand cresult = UnitCommand::rightClick(unit, target, (bool)shiftQueueCommand);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_haltConstruction(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_haltConstruction(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::haltConstruction(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelConstruction(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelConstruction(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cancelConstruction(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelAddon(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelAddon(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cancelAddon(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelTrain__Lbwapi4_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelTrain__Lbwapi_Unit_2(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cancelTrain(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelTrain__Lbwapi4_Unit_2I(JNIEnv * env, jclass jclz, jobject p_unit, jint slot){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelTrain__Lbwapi_Unit_2I(JNIEnv * env, jclass jclz, jobject p_unit, jint slot){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cancelTrain(unit, slot);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelMorph(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelMorph(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cancelMorph(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelResearch(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelResearch(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cancelResearch(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelUpgrade(JNIEnv * env, jclass jclz, jobject p_unit){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelUpgrade(JNIEnv * env, jclass jclz, jobject p_unit){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 UnitCommand cresult = UnitCommand::cancelUpgrade(unit);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_useTech__Lbwapi4_Unit_2Lbwapi4_TechType_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_tech){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_useTech__Lbwapi_Unit_2Lbwapi_TechType_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_tech){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 UnitCommand cresult = UnitCommand::useTech(unit, *tech);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_useTech__Lbwapi4_Unit_2Lbwapi4_TechType_2Lbwapi4_PositionOrUnit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_tech, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_useTech__Lbwapi_Unit_2Lbwapi_TechType_2Lbwapi_PositionOrUnit_2(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_tech, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 UnitCommand cresult = UnitCommand::useTech(unit, *tech, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_placeCOP(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_placeCOP(JNIEnv * env, jclass jclz, jobject p_unit, jobject p_target){
 Unit unit = (Unit)env->GetLongField(p_unit, FindCachedField(env, env->GetObjectClass(p_unit), "pointer", "J"));
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 UnitCommand cresult = UnitCommand::placeCOP(unit, target);
-jclass retcls = FindCachedClass(env, "bwapi4/UnitCommand");
-jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi4/Unit;Lbwapi4/UnitCommandType;Lbwapi4/Unit;III)V");
-jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getUnit())
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/UnitCommandType"), "get", "(J)Lbwapi4/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
-, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi4/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi4/Unit"), "get", "(J)Lbwapi4/Unit;"), cresult.getTarget())
+jclass retcls = FindCachedClass(env, "bwapi/UnitCommand");
+jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(Lbwapi/Unit;Lbwapi/UnitCommandType;Lbwapi/Unit;III)V");
+jobject result = env->NewObject(retcls, retConsID, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getUnit())
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/UnitCommandType"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/UnitCommandType"), "get", "(J)Lbwapi/UnitCommandType;"), (jlong)tableUnitCommandType.find(cresult.getType().getID())->second )
+, env->CallStaticObjectMethod(FindCachedClass(env, "bwapi/Unit"), FindCachedMethodStatic(env, FindCachedClass(env, "bwapi/Unit"), "get", "(J)Lbwapi/Unit;"), cresult.getTarget())
 , cresult.getTargetPosition().x 
 , cresult.getTargetPosition().y 
 , resolveUnitCommandExtra(cresult));
 return result;
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_UnitCommandType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_UnitCommandType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitCommandType* x_unitCommandType = (UnitCommandType*)pointer;
 return env->NewStringUTF(x_unitCommandType->toString().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getPosition_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 Position cresult = x_unitset->getPosition();
-jclass retcls = FindCachedClass(env, "bwapi4/Position");
+jclass retcls = FindCachedClass(env, "bwapi/Position");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getLoadedUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getLoadedUnits_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 Unitset cresult = x_unitset->getLoadedUnits();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getInterceptors_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getInterceptors_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 Unitset cresult = x_unitset->getInterceptors();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getLarva_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getLarva_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 Unitset cresult = x_unitset->getLarva();
 jclass listCls = FindCachedClass(env, "java/util/ArrayList");
 jmethodID listConsID = FindCachedMethod(env, listCls, "<init>", "()V");
 jobject result = env->NewObject(listCls, listConsID);
 jmethodID addMethodID = FindCachedMethod(env, listCls, "add", "(Ljava/lang/Object;)Z");
-jclass elemClass = FindCachedClass(env, "bwapi4/Unit");
-jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi4/Unit;");
+jclass elemClass = FindCachedClass(env, "bwapi/Unit");
+jmethodID getMethodID = FindCachedMethodStatic(env, elemClass, "get", "(J)Lbwapi/Unit;");
 for(Unitset::const_iterator it = cresult.begin(); it != cresult.end(); it++ ){const Unit elem_ptr = *it;
 jobject elem = env->CallStaticObjectMethod(elemClass, getMethodID, (long)elem_ptr) ;
 env->CallVoidMethod(result, addMethodID, elem);
 }
 return result;
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_issueCommand_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_issueCommand_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_command){
 Unitset* x_unitset = (Unitset*)pointer;
 UnitCommand command(convertUnitCommand(env, p_command ));
 return x_unitset->issueCommand(command);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_attack_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_attack_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unitset->attack(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_attack_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_attack_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unitset->attack(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_build_1native__JLbwapi4_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_build_1native__JLbwapi_UnitType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unitset* x_unitset = (Unitset*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unitset->build(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_build_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_build_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_type, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 TilePosition target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unitset->build(*type, target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_buildAddon_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_buildAddon_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unitset* x_unitset = (Unitset*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unitset->buildAddon(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_train_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_train_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unitset* x_unitset = (Unitset*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unitset->train(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_morph_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_morph_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_type){
 Unitset* x_unitset = (Unitset*)pointer;
 UnitType* type = (UnitType*)env->GetLongField(p_type, FindCachedField(env, env->GetObjectClass(p_type), "pointer", "J"));
 return x_unitset->morph(*type);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_setRallyPoint_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_setRallyPoint_1native(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unitset->setRallyPoint(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_move_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_move_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unitset->move(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_move_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_move_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unitset->move(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_patrol_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_patrol_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unitset->patrol(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_patrol_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_patrol_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unitset->patrol(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_holdPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_holdPosition_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->holdPosition();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_holdPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_holdPosition_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->holdPosition((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_stop_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_stop_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->stop();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_stop_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_stop_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->stop((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_follow_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_follow_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->follow(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_follow_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_follow_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->follow(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_gather_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_gather_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->gather(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_gather_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_gather_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->gather(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_returnCargo_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_returnCargo_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->returnCargo();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_returnCargo_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_returnCargo_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->returnCargo((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_repair_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_repair_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->repair(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_repair_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_repair_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->repair(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_burrow_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_burrow_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->burrow();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unburrow_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unburrow_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->unburrow();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cloak_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cloak_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cloak();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_decloak_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_decloak_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->decloak();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_siege_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_siege_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->siege();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unsiege_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unsiege_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->unsiege();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_lift_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_lift_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->lift();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_load_1native__JLbwapi4_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_load_1native__JLbwapi_Unit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->load(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_load_1native__JLbwapi4_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_load_1native__JLbwapi_Unit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 Unit target = (Unit)env->GetLongField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "pointer", "J"));
 return x_unitset->load(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->unloadAll();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JZ(JNIEnv * env, jobject obj, jlong pointer, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->unloadAll((bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__JLbwapi4_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JLbwapi_Position_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unitset->unloadAll(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__JLbwapi4_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JLbwapi_Position_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 Position target((int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "x", "I")), (int)env->GetIntField(p_target, FindCachedField(env, env->GetObjectClass(p_target), "y", "I")));
 return x_unitset->unloadAll(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_rightClick_1native__JLbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_rightClick_1native__JLbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unitset->rightClick(target);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_rightClick_1native__JLbwapi4_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_rightClick_1native__JLbwapi_PositionOrUnit_2Z(JNIEnv * env, jobject obj, jlong pointer, jobject p_target, jboolean shiftQueueCommand){
 Unitset* x_unitset = (Unitset*)pointer;
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unitset->rightClick(target, (bool)shiftQueueCommand);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_haltConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_haltConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->haltConstruction();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelConstruction_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cancelConstruction();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cancelAddon();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelTrain_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cancelTrain();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelTrain_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint slot){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelTrain_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint slot){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cancelTrain(slot);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelMorph_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelMorph_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cancelMorph();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelResearch_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelResearch_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cancelResearch();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
 Unitset* x_unitset = (Unitset*)pointer;
 return x_unitset->cancelUpgrade();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_useTech_1native__JLbwapi4_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_useTech_1native__JLbwapi_TechType_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech){
 Unitset* x_unitset = (Unitset*)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 return x_unitset->useTech(*tech);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_useTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_useTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2(JNIEnv * env, jobject obj, jlong pointer, jobject p_tech, jobject p_target){
 Unitset* x_unitset = (Unitset*)pointer;
 TechType* tech = (TechType*)env->GetLongField(p_tech, FindCachedField(env, env->GetObjectClass(p_tech), "pointer", "J"));
 PositionOrUnit target(convertPositionOrUnit(env, p_target ));
 return x_unitset->useTech(*tech, target);
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_UnitSizeType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_UnitSizeType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitSizeType* x_unitSizeType = (UnitSizeType*)pointer;
 return env->NewStringUTF(x_unitSizeType->toString().c_str());
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_UnitType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_UnitType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return env->NewStringUTF(x_unitType->toString().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 jlong resptr = (jlong)tableRace.find(x_unitType->getRace())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Race");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Race;");
+jclass retcls = FindCachedClass(env, "bwapi/Race");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Race;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_requiredTech_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_requiredTech_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 jlong resptr = (jlong)tableTechType.find(x_unitType->requiredTech())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/TechType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/TechType;");
+jclass retcls = FindCachedClass(env, "bwapi/TechType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/TechType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_cloakingTech_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_cloakingTech_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 jlong resptr = (jlong)tableTechType.find(x_unitType->cloakingTech())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/TechType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/TechType;");
+jclass retcls = FindCachedClass(env, "bwapi/TechType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/TechType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_armorUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_armorUpgrade_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 jlong resptr = (jlong)tableUpgradeType.find(x_unitType->armorUpgrade())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UpgradeType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UpgradeType;");
+jclass retcls = FindCachedClass(env, "bwapi/UpgradeType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UpgradeType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxHitPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxHitPoints_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->maxHitPoints();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxShields_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxShields_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->maxShields();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxEnergy_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxEnergy_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->maxEnergy();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_armor_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_armor_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->armor();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_mineralPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_mineralPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->mineralPrice();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_gasPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_gasPrice_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->gasPrice();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_buildTime_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_buildTime_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->buildTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_supplyRequired_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_supplyRequired_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->supplyRequired();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_supplyProvided_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_supplyProvided_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->supplyProvided();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_spaceRequired_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_spaceRequired_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->spaceRequired();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_spaceProvided_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_spaceProvided_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->spaceProvided();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_buildScore_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_buildScore_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->buildScore();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_destroyScore_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_destroyScore_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->destroyScore();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_size_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_size_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 jlong resptr = (jlong)x_unitType->size();
-jclass retcls = FindCachedClass(env, "bwapi4/UnitSizeType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitSizeType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitSizeType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitSizeType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_tileWidth_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_tileWidth_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->tileWidth();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_tileHeight_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_tileHeight_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->tileHeight();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_tileSize_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_tileSize_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 TilePosition cresult = x_unitType->tileSize();
-jclass retcls = FindCachedClass(env, "bwapi4/TilePosition");
+jclass retcls = FindCachedClass(env, "bwapi/TilePosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionLeft_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionLeft_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->dimensionLeft();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionUp_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionUp_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->dimensionUp();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionRight_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionRight_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->dimensionRight();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionDown_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionDown_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->dimensionDown();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_width_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_width_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->width();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_height_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_height_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->height();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_seekRange_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_seekRange_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->seekRange();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_sightRange_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_sightRange_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->sightRange();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_groundWeapon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_groundWeapon_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 jlong resptr = (jlong)tableWeaponType.find(x_unitType->groundWeapon())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/WeaponType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/WeaponType;");
+jclass retcls = FindCachedClass(env, "bwapi/WeaponType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/WeaponType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxGroundHits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxGroundHits_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->maxGroundHits();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_airWeapon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_airWeapon_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 jlong resptr = (jlong)tableWeaponType.find(x_unitType->airWeapon())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/WeaponType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/WeaponType;");
+jclass retcls = FindCachedClass(env, "bwapi/WeaponType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/WeaponType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxAirHits_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxAirHits_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->maxAirHits();
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_UnitType_topSpeed_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jdouble JNICALL Java_bwapi_UnitType_topSpeed_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->topSpeed();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_acceleration_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_acceleration_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->acceleration();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_haltDistance_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_haltDistance_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->haltDistance();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_turnRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_turnRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->turnRadius();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canProduce_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canProduce_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->canProduce();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canAttack_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canAttack_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->canAttack();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canMove_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canMove_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->canMove();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isFlyer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlyer_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isFlyer();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_regeneratesHP_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_regeneratesHP_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->regeneratesHP();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isSpellcaster_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpellcaster_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isSpellcaster();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_hasPermanentCloak_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_hasPermanentCloak_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->hasPermanentCloak();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isInvincible_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isInvincible_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isInvincible();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isOrganic_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isOrganic_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isOrganic();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isMechanical_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isMechanical_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isMechanical();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isRobotic_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isRobotic_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isRobotic();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isDetector_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isDetector_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isDetector();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isResourceContainer_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isResourceContainer_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isResourceContainer();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isResourceDepot_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isResourceDepot_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isResourceDepot();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isRefinery_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isRefinery_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isRefinery();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isWorker_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isWorker_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isWorker();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_requiresPsi_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_requiresPsi_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->requiresPsi();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_requiresCreep_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_requiresCreep_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->requiresCreep();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isTwoUnitsInOneEgg_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isTwoUnitsInOneEgg_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isTwoUnitsInOneEgg();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isBurrowable_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBurrowable_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isBurrowable();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isCloakable_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isCloakable_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isCloakable();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isBuilding();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isAddon();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isFlyingBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlyingBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isFlyingBuilding();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isNeutral_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isNeutral_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isNeutral();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isHero_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isHero_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isHero();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isPowerup_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isPowerup_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isPowerup();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isBeacon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBeacon_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isBeacon();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isFlagBeacon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlagBeacon_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isFlagBeacon();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isSpecialBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpecialBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isSpecialBuilding();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isSpell_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpell_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isSpell();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_producesLarva_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_producesLarva_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->producesLarva();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isMineralField_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isMineralField_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isMineralField();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isCritter_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isCritter_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->isCritter();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canBuildAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canBuildAddon_1native(JNIEnv * env, jobject obj, jlong pointer){
 UnitType* x_unitType = (UnitType*)pointer;
 return x_unitType->canBuildAddon();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_UpgradeType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_UpgradeType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return env->NewStringUTF(x_upgradeType->toString().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_getRace_1native(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 jlong resptr = (jlong)tableRace.find(x_upgradeType->getRace())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/Race");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/Race;");
+jclass retcls = FindCachedClass(env, "bwapi/Race");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/Race;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_mineralPrice_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPrice_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->mineralPrice();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_mineralPrice_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPrice_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->mineralPrice(level);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_mineralPriceFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPriceFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->mineralPriceFactor();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_gasPrice_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPrice_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->gasPrice();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_gasPrice_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPrice_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->gasPrice(level);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_gasPriceFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPriceFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->gasPriceFactor();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_upgradeTime_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTime_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->upgradeTime();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_upgradeTime_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTime_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->upgradeTime(level);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_upgradeTimeFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTimeFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->upgradeTimeFactor();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_maxRepeats_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_maxRepeats_1native(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 return x_upgradeType->maxRepeats();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_whatUpgrades_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatUpgrades_1native(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_upgradeType->whatUpgrades())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_whatsRequired_1native__J(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatsRequired_1native__J(JNIEnv * env, jobject obj, jlong pointer){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_upgradeType->whatsRequired())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_whatsRequired_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatsRequired_1native__JI(JNIEnv * env, jobject obj, jlong pointer, jint level){
 UpgradeType* x_upgradeType = (UpgradeType*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_upgradeType->whatsRequired(level))->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WalkPosition_isValid(JNIEnv * env, jobject obj){
+JNIEXPORT jboolean JNICALL Java_bwapi_WalkPosition_isValid(JNIEnv * env, jobject obj){
 WalkPosition x_walkPosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 return x_walkPosition.isValid();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_WalkPosition_makeValid(JNIEnv * env, jobject obj){
+JNIEXPORT jobject JNICALL Java_bwapi_WalkPosition_makeValid(JNIEnv * env, jobject obj){
 WalkPosition x_walkPosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 WalkPosition cresult = x_walkPosition.makeValid();
-jclass retcls = FindCachedClass(env, "bwapi4/WalkPosition");
+jclass retcls = FindCachedClass(env, "bwapi/WalkPosition");
 jmethodID retConsID = FindCachedMethod(env, retcls, "<init>", "(II)V");
 jobject result = env->NewObject(retcls, retConsID, cresult.x, cresult.y);
 return result;
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_WalkPosition_getDistance(JNIEnv * env, jobject obj, jobject p_position){
-WalkPosition x_walkPosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
-WalkPosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
-return x_walkPosition.getDistance(position);
-}
-JNIEXPORT jint JNICALL Java_bwapi4_WalkPosition_getApproxDistance(JNIEnv * env, jobject obj, jobject p_position){
+JNIEXPORT jint JNICALL Java_bwapi_WalkPosition_getApproxDistance(JNIEnv * env, jobject obj, jobject p_position){
 WalkPosition x_walkPosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 WalkPosition position((int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "x", "I")), (int)env->GetIntField(p_position, FindCachedField(env, env->GetObjectClass(p_position), "y", "I")));
 return x_walkPosition.getApproxDistance(position);
 }
-JNIEXPORT jdouble JNICALL Java_bwapi4_WalkPosition_getLength(JNIEnv * env, jobject obj){
+JNIEXPORT jdouble JNICALL Java_bwapi_WalkPosition_getLength(JNIEnv * env, jobject obj){
 WalkPosition x_walkPosition((int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "x", "I")), (int)env->GetIntField(obj, FindCachedField(env, env->GetObjectClass(obj), "y", "I")));
 return x_walkPosition.getLength();
 }
-JNIEXPORT jstring JNICALL Java_bwapi4_WeaponType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jstring JNICALL Java_bwapi_WeaponType_toString_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return env->NewStringUTF(x_weaponType->toString().c_str());
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_getTech_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_getTech_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 jlong resptr = (jlong)tableTechType.find(x_weaponType->getTech())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/TechType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/TechType;");
+jclass retcls = FindCachedClass(env, "bwapi/TechType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/TechType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_whatUses_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_whatUses_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 jlong resptr = (jlong)tableUnitType.find(x_weaponType->whatUses())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UnitType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UnitType;");
+jclass retcls = FindCachedClass(env, "bwapi/UnitType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UnitType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageAmount_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageAmount_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->damageAmount();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageBonus_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageBonus_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->damageBonus();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageCooldown_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->damageCooldown();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageFactor_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->damageFactor();
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_upgradeType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_upgradeType_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 jlong resptr = (jlong)tableUpgradeType.find(x_weaponType->upgradeType())->second;
-jclass retcls = FindCachedClass(env, "bwapi4/UpgradeType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/UpgradeType;");
+jclass retcls = FindCachedClass(env, "bwapi/UpgradeType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/UpgradeType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_damageType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_damageType_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 jlong resptr = (jlong)x_weaponType->damageType();
-jclass retcls = FindCachedClass(env, "bwapi4/DamageType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/DamageType;");
+jclass retcls = FindCachedClass(env, "bwapi/DamageType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/DamageType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_explosionType_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_explosionType_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 jlong resptr = (jlong)x_weaponType->explosionType();
-jclass retcls = FindCachedClass(env, "bwapi4/ExplosionType");
-jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi4/ExplosionType;");
+jclass retcls = FindCachedClass(env, "bwapi/ExplosionType");
+jmethodID mid = FindCachedMethodStatic(env, retcls, "get", "(J)Lbwapi/ExplosionType;");
 return env->CallStaticObjectMethod(retcls, mid, resptr);
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_minRange_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_minRange_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->minRange();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_maxRange_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_maxRange_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->maxRange();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_innerSplashRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_innerSplashRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->innerSplashRadius();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_medianSplashRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_medianSplashRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->medianSplashRadius();
 }
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_outerSplashRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_outerSplashRadius_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->outerSplashRadius();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsAir_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsAir_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsAir();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsGround_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsGround_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsGround();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsMechanical_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsMechanical_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsMechanical();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsOrganic_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOrganic_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsOrganic();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsNonBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsNonBuilding_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsNonBuilding();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsNonRobotic_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsNonRobotic_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsNonRobotic();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsTerrain_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsTerrain_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsTerrain();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsOrgOrMech_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOrgOrMech_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsOrgOrMech();
 }
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsOwn_1native(JNIEnv * env, jobject obj, jlong pointer){
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOwn_1native(JNIEnv * env, jobject obj, jlong pointer){
 WeaponType* x_weaponType = (WeaponType*)pointer;
 return x_weaponType->targetsOwn();
 }
@@ -5858,1561 +5843,1561 @@ void println(const char * text){
 	flushPrint("\n");
 }
 
-JNIEXPORT void JNICALL Java_bwapi4_Mirror_startGame(JNIEnv * env, jobject obj){
+JNIEXPORT void JNICALL Java_bwapi_Mirror_startGame(JNIEnv * env, jobject obj){
 jclass cls;
 jmethodID getId;
-cls = env->FindClass("Lbwapi4/BulletType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/BulletType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Melee", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Melee));
+cls = env->FindClass("Lbwapi/BulletType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/BulletType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Melee", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Melee));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Melee.getID(), &BulletTypes::Melee));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fusion_Cutter_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Fusion_Cutter_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fusion_Cutter_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Fusion_Cutter_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Fusion_Cutter_Hit.getID(), &BulletTypes::Fusion_Cutter_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gauss_Rifle_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Gauss_Rifle_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gauss_Rifle_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Gauss_Rifle_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Gauss_Rifle_Hit.getID(), &BulletTypes::Gauss_Rifle_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::C_10_Canister_Rifle_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::C_10_Canister_Rifle_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::C_10_Canister_Rifle_Hit.getID(), &BulletTypes::C_10_Canister_Rifle_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gemini_Missiles", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Gemini_Missiles));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gemini_Missiles", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Gemini_Missiles));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Gemini_Missiles.getID(), &BulletTypes::Gemini_Missiles));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fragmentation_Grenade", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Fragmentation_Grenade));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fragmentation_Grenade", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Fragmentation_Grenade));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Fragmentation_Grenade.getID(), &BulletTypes::Fragmentation_Grenade));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Longbolt_Missile", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Longbolt_Missile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Longbolt_Missile", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Longbolt_Missile));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Longbolt_Missile.getID(), &BulletTypes::Longbolt_Missile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_ATA_Laser_Battery", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::ATS_ATA_Laser_Battery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_ATA_Laser_Battery", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::ATS_ATA_Laser_Battery));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::ATS_ATA_Laser_Battery.getID(), &BulletTypes::ATS_ATA_Laser_Battery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burst_Lasers", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Burst_Lasers));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burst_Lasers", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Burst_Lasers));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Burst_Lasers.getID(), &BulletTypes::Burst_Lasers));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Shock_Cannon_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Arclite_Shock_Cannon_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Shock_Cannon_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Arclite_Shock_Cannon_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Arclite_Shock_Cannon_Hit.getID(), &BulletTypes::Arclite_Shock_Cannon_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Missile", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::EMP_Missile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Missile", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::EMP_Missile));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::EMP_Missile.getID(), &BulletTypes::EMP_Missile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Dual_Photon_Blasters_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Dual_Photon_Blasters_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Dual_Photon_Blasters_Hit.getID(), &BulletTypes::Dual_Photon_Blasters_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Particle_Beam_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Particle_Beam_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Particle_Beam_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Particle_Beam_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Particle_Beam_Hit.getID(), &BulletTypes::Particle_Beam_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missile", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Anti_Matter_Missile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missile", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Anti_Matter_Missile));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Anti_Matter_Missile.getID(), &BulletTypes::Anti_Matter_Missile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pulse_Cannon", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Pulse_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pulse_Cannon", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Pulse_Cannon));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Pulse_Cannon.getID(), &BulletTypes::Pulse_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Shockwave_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Psionic_Shockwave_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Shockwave_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Psionic_Shockwave_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Psionic_Shockwave_Hit.getID(), &BulletTypes::Psionic_Shockwave_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Storm", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Psionic_Storm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Storm", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Psionic_Storm));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Psionic_Storm.getID(), &BulletTypes::Psionic_Storm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Yamato_Gun));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Yamato_Gun));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Yamato_Gun.getID(), &BulletTypes::Yamato_Gun));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Phase_Disruptor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Phase_Disruptor));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Phase_Disruptor.getID(), &BulletTypes::Phase_Disruptor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "STA_STS_Cannon_Overlay", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::STA_STS_Cannon_Overlay));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "STA_STS_Cannon_Overlay", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::STA_STS_Cannon_Overlay));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::STA_STS_Cannon_Overlay.getID(), &BulletTypes::STA_STS_Cannon_Overlay));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sunken_Colony_Tentacle", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Sunken_Colony_Tentacle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sunken_Colony_Tentacle", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Sunken_Colony_Tentacle));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Sunken_Colony_Tentacle.getID(), &BulletTypes::Sunken_Colony_Tentacle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Acid_Spore", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Acid_Spore));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Acid_Spore", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Acid_Spore));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Acid_Spore.getID(), &BulletTypes::Acid_Spore));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Glave_Wurm", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Glave_Wurm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Glave_Wurm", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Glave_Wurm));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Glave_Wurm.getID(), &BulletTypes::Glave_Wurm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Seeker_Spores", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Seeker_Spores));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Seeker_Spores", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Seeker_Spores));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Seeker_Spores.getID(), &BulletTypes::Seeker_Spores));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Queen_Spell_Carrier", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Queen_Spell_Carrier));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Queen_Spell_Carrier", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Queen_Spell_Carrier));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Queen_Spell_Carrier.getID(), &BulletTypes::Queen_Spell_Carrier));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague_Cloud", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Plague_Cloud));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague_Cloud", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Plague_Cloud));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Plague_Cloud.getID(), &BulletTypes::Plague_Cloud));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Consume));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Consume));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Consume.getID(), &BulletTypes::Consume));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Ensnare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Ensnare));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Ensnare.getID(), &BulletTypes::Ensnare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Needle_Spine_Hit", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Needle_Spine_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Needle_Spine_Hit", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Needle_Spine_Hit));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Needle_Spine_Hit.getID(), &BulletTypes::Needle_Spine_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Invisible", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Invisible));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Invisible", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Invisible));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Invisible.getID(), &BulletTypes::Invisible));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare_Grenade", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Optical_Flare_Grenade));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare_Grenade", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Optical_Flare_Grenade));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Optical_Flare_Grenade.getID(), &BulletTypes::Optical_Flare_Grenade));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Halo_Rockets", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Halo_Rockets));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Halo_Rockets", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Halo_Rockets));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Halo_Rockets.getID(), &BulletTypes::Halo_Rockets));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Subterranean_Spines", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Subterranean_Spines));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Subterranean_Spines", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Subterranean_Spines));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Subterranean_Spines.getID(), &BulletTypes::Subterranean_Spines));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Corrosive_Acid_Shot", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Corrosive_Acid_Shot));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Corrosive_Acid_Shot", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Corrosive_Acid_Shot));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Corrosive_Acid_Shot.getID(), &BulletTypes::Corrosive_Acid_Shot));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutron_Flare", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Neutron_Flare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutron_Flare", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Neutron_Flare));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Neutron_Flare.getID(), &BulletTypes::Neutron_Flare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::None));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::None.getID(), &BulletTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/BulletType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&BulletTypes::Unknown));
 tableBulletType.insert(std::pair<int, const BulletType*>(BulletTypes::Unknown.getID(), &BulletTypes::Unknown));
-cls = env->FindClass("Lbwapi4/Color;");
+cls = env->FindClass("Lbwapi/Color;");
 getId = env->GetMethodID(cls,"<init>", "(III)V");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Red", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Red.red(), Colors::Red.green(), Colors::Red.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Blue", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Blue.red(), Colors::Blue.green(), Colors::Blue.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Teal", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Teal.red(), Colors::Teal.green(), Colors::Teal.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Purple", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Purple.red(), Colors::Purple.green(), Colors::Purple.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Orange", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Orange.red(), Colors::Orange.green(), Colors::Orange.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Brown", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Brown.red(), Colors::Brown.green(), Colors::Brown.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "White", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::White.red(), Colors::White.green(), Colors::White.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yellow", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Yellow.red(), Colors::Yellow.green(), Colors::Yellow.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Green", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Green.red(), Colors::Green.green(), Colors::Green.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cyan", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Cyan.red(), Colors::Cyan.green(), Colors::Cyan.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Black", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Black.red(), Colors::Black.green(), Colors::Black.blue()));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Grey", "Lbwapi4/Color;"), env->NewObject(cls, getId, Colors::Grey.red(), Colors::Grey.green(), Colors::Grey.blue()));
-cls = env->FindClass("Lbwapi4/DamageType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/DamageType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Independent", "Lbwapi4/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Independent));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Red", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Red.red(), Colors::Red.green(), Colors::Red.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Blue", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Blue.red(), Colors::Blue.green(), Colors::Blue.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Teal", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Teal.red(), Colors::Teal.green(), Colors::Teal.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Purple", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Purple.red(), Colors::Purple.green(), Colors::Purple.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Orange", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Orange.red(), Colors::Orange.green(), Colors::Orange.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Brown", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Brown.red(), Colors::Brown.green(), Colors::Brown.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "White", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::White.red(), Colors::White.green(), Colors::White.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yellow", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Yellow.red(), Colors::Yellow.green(), Colors::Yellow.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Green", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Green.red(), Colors::Green.green(), Colors::Green.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cyan", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Cyan.red(), Colors::Cyan.green(), Colors::Cyan.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Black", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Black.red(), Colors::Black.green(), Colors::Black.blue()));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Grey", "Lbwapi/Color;"), env->NewObject(cls, getId, Colors::Grey.red(), Colors::Grey.green(), Colors::Grey.blue()));
+cls = env->FindClass("Lbwapi/DamageType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/DamageType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Independent", "Lbwapi/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Independent));
 tableDamageType.insert(std::pair<int, const DamageType*>(DamageTypes::Independent.getID(), &DamageTypes::Independent));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Explosive", "Lbwapi4/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Explosive));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Explosive", "Lbwapi/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Explosive));
 tableDamageType.insert(std::pair<int, const DamageType*>(DamageTypes::Explosive.getID(), &DamageTypes::Explosive));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Concussive", "Lbwapi4/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Concussive));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Concussive", "Lbwapi/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Concussive));
 tableDamageType.insert(std::pair<int, const DamageType*>(DamageTypes::Concussive.getID(), &DamageTypes::Concussive));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Normal", "Lbwapi4/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Normal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Normal", "Lbwapi/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Normal));
 tableDamageType.insert(std::pair<int, const DamageType*>(DamageTypes::Normal.getID(), &DamageTypes::Normal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ignore_Armor", "Lbwapi4/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Ignore_Armor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ignore_Armor", "Lbwapi/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Ignore_Armor));
 tableDamageType.insert(std::pair<int, const DamageType*>(DamageTypes::Ignore_Armor.getID(), &DamageTypes::Ignore_Armor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::None));
 tableDamageType.insert(std::pair<int, const DamageType*>(DamageTypes::None.getID(), &DamageTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/DamageType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&DamageTypes::Unknown));
 tableDamageType.insert(std::pair<int, const DamageType*>(DamageTypes::Unknown.getID(), &DamageTypes::Unknown));
-cls = env->FindClass("Lbwapi4/Error;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/Error;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Does_Not_Exist", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Does_Not_Exist));
+cls = env->FindClass("Lbwapi/Error;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/Error;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Does_Not_Exist", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Does_Not_Exist));
 tableError.insert(std::pair<int, const Error*>(Errors::Unit_Does_Not_Exist.getID(), &Errors::Unit_Does_Not_Exist));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Not_Visible", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Not_Visible));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Not_Visible", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Not_Visible));
 tableError.insert(std::pair<int, const Error*>(Errors::Unit_Not_Visible.getID(), &Errors::Unit_Not_Visible));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Not_Owned", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Not_Owned));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Not_Owned", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Not_Owned));
 tableError.insert(std::pair<int, const Error*>(Errors::Unit_Not_Owned.getID(), &Errors::Unit_Not_Owned));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Busy", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Busy));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unit_Busy", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unit_Busy));
 tableError.insert(std::pair<int, const Error*>(Errors::Unit_Busy.getID(), &Errors::Unit_Busy));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Incompatible_UnitType", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Incompatible_UnitType));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Incompatible_UnitType", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Incompatible_UnitType));
 tableError.insert(std::pair<int, const Error*>(Errors::Incompatible_UnitType.getID(), &Errors::Incompatible_UnitType));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Incompatible_TechType", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Incompatible_TechType));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Incompatible_TechType", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Incompatible_TechType));
 tableError.insert(std::pair<int, const Error*>(Errors::Incompatible_TechType.getID(), &Errors::Incompatible_TechType));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Incompatible_State", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Incompatible_State));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Incompatible_State", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Incompatible_State));
 tableError.insert(std::pair<int, const Error*>(Errors::Incompatible_State.getID(), &Errors::Incompatible_State));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Already_Researched", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Already_Researched));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Already_Researched", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Already_Researched));
 tableError.insert(std::pair<int, const Error*>(Errors::Already_Researched.getID(), &Errors::Already_Researched));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fully_Upgraded", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Fully_Upgraded));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fully_Upgraded", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Fully_Upgraded));
 tableError.insert(std::pair<int, const Error*>(Errors::Fully_Upgraded.getID(), &Errors::Fully_Upgraded));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Currently_Researching", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Currently_Researching));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Currently_Researching", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Currently_Researching));
 tableError.insert(std::pair<int, const Error*>(Errors::Currently_Researching.getID(), &Errors::Currently_Researching));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Currently_Upgrading", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Currently_Upgrading));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Currently_Upgrading", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Currently_Upgrading));
 tableError.insert(std::pair<int, const Error*>(Errors::Currently_Upgrading.getID(), &Errors::Currently_Upgrading));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Minerals", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Minerals));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Minerals", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Minerals));
 tableError.insert(std::pair<int, const Error*>(Errors::Insufficient_Minerals.getID(), &Errors::Insufficient_Minerals));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Gas", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Gas));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Gas", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Gas));
 tableError.insert(std::pair<int, const Error*>(Errors::Insufficient_Gas.getID(), &Errors::Insufficient_Gas));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Supply", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Supply));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Supply", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Supply));
 tableError.insert(std::pair<int, const Error*>(Errors::Insufficient_Supply.getID(), &Errors::Insufficient_Supply));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Energy", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Energy));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Energy", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Energy));
 tableError.insert(std::pair<int, const Error*>(Errors::Insufficient_Energy.getID(), &Errors::Insufficient_Energy));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Tech", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Tech));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Tech", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Tech));
 tableError.insert(std::pair<int, const Error*>(Errors::Insufficient_Tech.getID(), &Errors::Insufficient_Tech));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Ammo", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Ammo));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Ammo", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Ammo));
 tableError.insert(std::pair<int, const Error*>(Errors::Insufficient_Ammo.getID(), &Errors::Insufficient_Ammo));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Space", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Space));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Insufficient_Space", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Insufficient_Space));
 tableError.insert(std::pair<int, const Error*>(Errors::Insufficient_Space.getID(), &Errors::Insufficient_Space));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Invalid_Tile_Position", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Invalid_Tile_Position));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Invalid_Tile_Position", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Invalid_Tile_Position));
 tableError.insert(std::pair<int, const Error*>(Errors::Invalid_Tile_Position.getID(), &Errors::Invalid_Tile_Position));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unbuildable_Location", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unbuildable_Location));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unbuildable_Location", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unbuildable_Location));
 tableError.insert(std::pair<int, const Error*>(Errors::Unbuildable_Location.getID(), &Errors::Unbuildable_Location));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unreachable_Location", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unreachable_Location));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unreachable_Location", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unreachable_Location));
 tableError.insert(std::pair<int, const Error*>(Errors::Unreachable_Location.getID(), &Errors::Unreachable_Location));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Out_Of_Range", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Out_Of_Range));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Out_Of_Range", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Out_Of_Range));
 tableError.insert(std::pair<int, const Error*>(Errors::Out_Of_Range.getID(), &Errors::Out_Of_Range));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unable_To_Hit", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unable_To_Hit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unable_To_Hit", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unable_To_Hit));
 tableError.insert(std::pair<int, const Error*>(Errors::Unable_To_Hit.getID(), &Errors::Unable_To_Hit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Access_Denied", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Access_Denied));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Access_Denied", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Access_Denied));
 tableError.insert(std::pair<int, const Error*>(Errors::Access_Denied.getID(), &Errors::Access_Denied));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "File_Not_Found", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::File_Not_Found));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "File_Not_Found", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::File_Not_Found));
 tableError.insert(std::pair<int, const Error*>(Errors::File_Not_Found.getID(), &Errors::File_Not_Found));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Invalid_Parameter", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Invalid_Parameter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Invalid_Parameter", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Invalid_Parameter));
 tableError.insert(std::pair<int, const Error*>(Errors::Invalid_Parameter.getID(), &Errors::Invalid_Parameter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::None));
 tableError.insert(std::pair<int, const Error*>(Errors::None.getID(), &Errors::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/Error;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Errors::Unknown));
 tableError.insert(std::pair<int, const Error*>(Errors::Unknown.getID(), &Errors::Unknown));
-cls = env->FindClass("Lbwapi4/ExplosionType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/ExplosionType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::None));
+cls = env->FindClass("Lbwapi/ExplosionType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/ExplosionType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::None));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::None.getID(), &ExplosionTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Normal", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Normal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Normal", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Normal));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Normal.getID(), &ExplosionTypes::Normal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Radial_Splash", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Radial_Splash));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Radial_Splash", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Radial_Splash));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Radial_Splash.getID(), &ExplosionTypes::Radial_Splash));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Enemy_Splash", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Enemy_Splash));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Enemy_Splash", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Enemy_Splash));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Enemy_Splash.getID(), &ExplosionTypes::Enemy_Splash));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lockdown", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Lockdown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lockdown", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Lockdown));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Lockdown.getID(), &ExplosionTypes::Lockdown));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nuclear_Missile", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Nuclear_Missile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nuclear_Missile", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Nuclear_Missile));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Nuclear_Missile.getID(), &ExplosionTypes::Nuclear_Missile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Parasite", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Parasite));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Parasite", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Parasite));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Parasite.getID(), &ExplosionTypes::Parasite));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Broodlings", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Broodlings));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Broodlings", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Broodlings));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Broodlings.getID(), &ExplosionTypes::Broodlings));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Shockwave", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::EMP_Shockwave));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Shockwave", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::EMP_Shockwave));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::EMP_Shockwave.getID(), &ExplosionTypes::EMP_Shockwave));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Irradiate", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Irradiate));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Irradiate", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Irradiate));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Irradiate.getID(), &ExplosionTypes::Irradiate));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Ensnare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Ensnare));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Ensnare.getID(), &ExplosionTypes::Ensnare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Plague));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Plague));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Plague.getID(), &ExplosionTypes::Plague));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stasis_Field", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Stasis_Field));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stasis_Field", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Stasis_Field));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Stasis_Field.getID(), &ExplosionTypes::Stasis_Field));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Swarm", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Dark_Swarm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Swarm", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Dark_Swarm));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Dark_Swarm.getID(), &ExplosionTypes::Dark_Swarm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Consume));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Consume));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Consume.getID(), &ExplosionTypes::Consume));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Yamato_Gun));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Yamato_Gun));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Yamato_Gun.getID(), &ExplosionTypes::Yamato_Gun));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Restoration", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Restoration));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Restoration", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Restoration));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Restoration.getID(), &ExplosionTypes::Restoration));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Disruption_Web", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Disruption_Web));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Disruption_Web", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Disruption_Web));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Disruption_Web.getID(), &ExplosionTypes::Disruption_Web));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Corrosive_Acid", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Corrosive_Acid));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Corrosive_Acid", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Corrosive_Acid));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Corrosive_Acid.getID(), &ExplosionTypes::Corrosive_Acid));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Mind_Control", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Mind_Control));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Mind_Control", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Mind_Control));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Mind_Control.getID(), &ExplosionTypes::Mind_Control));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Feedback", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Feedback));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Feedback", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Feedback));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Feedback.getID(), &ExplosionTypes::Feedback));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Optical_Flare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Optical_Flare));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Optical_Flare.getID(), &ExplosionTypes::Optical_Flare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Maelstrom", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Maelstrom));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Maelstrom", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Maelstrom));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Maelstrom.getID(), &ExplosionTypes::Maelstrom));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Air_Splash", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Air_Splash));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Air_Splash", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Air_Splash));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Air_Splash.getID(), &ExplosionTypes::Air_Splash));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/ExplosionType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&ExplosionTypes::Unknown));
 tableExplosionType.insert(std::pair<int, const ExplosionType*>(ExplosionTypes::Unknown.getID(), &ExplosionTypes::Unknown));
-cls = env->FindClass("Lbwapi4/GameType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/GameType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Melee", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Melee));
+cls = env->FindClass("Lbwapi/GameType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/GameType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Melee", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Melee));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Melee.getID(), &GameTypes::Melee));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Free_For_All", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Free_For_All));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Free_For_All", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Free_For_All));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Free_For_All.getID(), &GameTypes::Free_For_All));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "One_on_One", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::One_on_One));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "One_on_One", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::One_on_One));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::One_on_One.getID(), &GameTypes::One_on_One));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Capture_The_Flag", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Capture_The_Flag));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Capture_The_Flag", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Capture_The_Flag));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Capture_The_Flag.getID(), &GameTypes::Capture_The_Flag));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Greed", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Greed));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Greed", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Greed));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Greed.getID(), &GameTypes::Greed));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Slaughter", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Slaughter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Slaughter", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Slaughter));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Slaughter.getID(), &GameTypes::Slaughter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sudden_Death", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Sudden_Death));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sudden_Death", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Sudden_Death));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Sudden_Death.getID(), &GameTypes::Sudden_Death));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ladder", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Ladder));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ladder", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Ladder));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Ladder.getID(), &GameTypes::Ladder));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Map_Settings", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Use_Map_Settings));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Map_Settings", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Use_Map_Settings));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Use_Map_Settings.getID(), &GameTypes::Use_Map_Settings));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Team_Melee", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Team_Melee));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Team_Melee", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Team_Melee));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Team_Melee.getID(), &GameTypes::Team_Melee));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Team_Free_For_All", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Team_Free_For_All));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Team_Free_For_All", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Team_Free_For_All));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Team_Free_For_All.getID(), &GameTypes::Team_Free_For_All));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Team_Capture_The_Flag", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Team_Capture_The_Flag));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Team_Capture_The_Flag", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Team_Capture_The_Flag));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Team_Capture_The_Flag.getID(), &GameTypes::Team_Capture_The_Flag));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Top_vs_Bottom", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Top_vs_Bottom));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Top_vs_Bottom", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Top_vs_Bottom));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Top_vs_Bottom.getID(), &GameTypes::Top_vs_Bottom));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::None));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::None.getID(), &GameTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/GameType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&GameTypes::Unknown));
 tableGameType.insert(std::pair<int, const GameType*>(GameTypes::Unknown.getID(), &GameTypes::Unknown));
-cls = env->FindClass("Lbwapi4/Order;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/Order;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Die", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Die));
+cls = env->FindClass("Lbwapi/Order;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/Order;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Die", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Die));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Die.getID(), &Orders::Die));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stop", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Stop));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stop", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Stop));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Stop.getID(), &Orders::Stop));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Guard", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Guard));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Guard", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Guard));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Guard.getID(), &Orders::Guard));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlayerGuard", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlayerGuard));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlayerGuard", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlayerGuard));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PlayerGuard.getID(), &Orders::PlayerGuard));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "TurretGuard", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::TurretGuard));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "TurretGuard", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::TurretGuard));
 tableOrder.insert(std::pair<int, const Order*>(Orders::TurretGuard.getID(), &Orders::TurretGuard));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BunkerGuard", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BunkerGuard));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BunkerGuard", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BunkerGuard));
 tableOrder.insert(std::pair<int, const Order*>(Orders::BunkerGuard.getID(), &Orders::BunkerGuard));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Move", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Move));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Move", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Move));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Move.getID(), &Orders::Move));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AttackUnit", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AttackUnit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AttackUnit", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AttackUnit));
 tableOrder.insert(std::pair<int, const Order*>(Orders::AttackUnit.getID(), &Orders::AttackUnit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AttackTile", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AttackTile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AttackTile", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AttackTile));
 tableOrder.insert(std::pair<int, const Order*>(Orders::AttackTile.getID(), &Orders::AttackTile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hover", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Hover));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hover", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Hover));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Hover.getID(), &Orders::Hover));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AttackMove", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AttackMove));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AttackMove", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AttackMove));
 tableOrder.insert(std::pair<int, const Order*>(Orders::AttackMove.getID(), &Orders::AttackMove));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InfestedCommandCenter", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InfestedCommandCenter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InfestedCommandCenter", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InfestedCommandCenter));
 tableOrder.insert(std::pair<int, const Order*>(Orders::InfestedCommandCenter.getID(), &Orders::InfestedCommandCenter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "UnusedNothing", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::UnusedNothing));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "UnusedNothing", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::UnusedNothing));
 tableOrder.insert(std::pair<int, const Order*>(Orders::UnusedNothing.getID(), &Orders::UnusedNothing));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "UnusedPowerup", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::UnusedPowerup));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "UnusedPowerup", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::UnusedPowerup));
 tableOrder.insert(std::pair<int, const Order*>(Orders::UnusedPowerup.getID(), &Orders::UnusedPowerup));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "TowerGuard", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::TowerGuard));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "TowerGuard", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::TowerGuard));
 tableOrder.insert(std::pair<int, const Order*>(Orders::TowerGuard.getID(), &Orders::TowerGuard));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "VultureMine", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::VultureMine));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "VultureMine", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::VultureMine));
 tableOrder.insert(std::pair<int, const Order*>(Orders::VultureMine.getID(), &Orders::VultureMine));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nothing", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Nothing));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nothing", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Nothing));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Nothing.getID(), &Orders::Nothing));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastInfestation", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastInfestation));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastInfestation", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastInfestation));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastInfestation.getID(), &Orders::CastInfestation));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InfestingCommandCenter", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InfestingCommandCenter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InfestingCommandCenter", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InfestingCommandCenter));
 tableOrder.insert(std::pair<int, const Order*>(Orders::InfestingCommandCenter.getID(), &Orders::InfestingCommandCenter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlaceBuilding", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlaceBuilding));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlaceBuilding", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlaceBuilding));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PlaceBuilding.getID(), &Orders::PlaceBuilding));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CreateProtossBuilding", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CreateProtossBuilding));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CreateProtossBuilding", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CreateProtossBuilding));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CreateProtossBuilding.getID(), &Orders::CreateProtossBuilding));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ConstructingBuilding", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ConstructingBuilding));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ConstructingBuilding", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ConstructingBuilding));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ConstructingBuilding.getID(), &Orders::ConstructingBuilding));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Repair", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Repair));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Repair", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Repair));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Repair.getID(), &Orders::Repair));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlaceAddon", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlaceAddon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlaceAddon", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlaceAddon));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PlaceAddon.getID(), &Orders::PlaceAddon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildAddon", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildAddon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildAddon", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildAddon));
 tableOrder.insert(std::pair<int, const Order*>(Orders::BuildAddon.getID(), &Orders::BuildAddon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Train", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Train));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Train", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Train));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Train.getID(), &Orders::Train));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RallyPointUnit", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RallyPointUnit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RallyPointUnit", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RallyPointUnit));
 tableOrder.insert(std::pair<int, const Order*>(Orders::RallyPointUnit.getID(), &Orders::RallyPointUnit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RallyPointTile", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RallyPointTile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RallyPointTile", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RallyPointTile));
 tableOrder.insert(std::pair<int, const Order*>(Orders::RallyPointTile.getID(), &Orders::RallyPointTile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ZergBirth", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ZergBirth));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ZergBirth", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ZergBirth));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ZergBirth.getID(), &Orders::ZergBirth));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ZergUnitMorph", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ZergUnitMorph));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ZergUnitMorph", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ZergUnitMorph));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ZergUnitMorph.getID(), &Orders::ZergUnitMorph));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ZergBuildingMorph", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ZergBuildingMorph));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ZergBuildingMorph", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ZergBuildingMorph));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ZergBuildingMorph.getID(), &Orders::ZergBuildingMorph));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "IncompleteBuilding", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::IncompleteBuilding));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "IncompleteBuilding", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::IncompleteBuilding));
 tableOrder.insert(std::pair<int, const Order*>(Orders::IncompleteBuilding.getID(), &Orders::IncompleteBuilding));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildNydusExit", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildNydusExit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildNydusExit", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildNydusExit));
 tableOrder.insert(std::pair<int, const Order*>(Orders::BuildNydusExit.getID(), &Orders::BuildNydusExit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EnterNydusCanal", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::EnterNydusCanal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EnterNydusCanal", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::EnterNydusCanal));
 tableOrder.insert(std::pair<int, const Order*>(Orders::EnterNydusCanal.getID(), &Orders::EnterNydusCanal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Follow", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Follow));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Follow", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Follow));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Follow.getID(), &Orders::Follow));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Carrier", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Carrier));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Carrier", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Carrier));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Carrier.getID(), &Orders::Carrier));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ReaverCarrierMove", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ReaverCarrierMove));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ReaverCarrierMove", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ReaverCarrierMove));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ReaverCarrierMove.getID(), &Orders::ReaverCarrierMove));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CarrierIgnore2", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CarrierIgnore2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CarrierIgnore2", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CarrierIgnore2));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CarrierIgnore2.getID(), &Orders::CarrierIgnore2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Reaver", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Reaver));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Reaver", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Reaver));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Reaver.getID(), &Orders::Reaver));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "TrainFighter", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::TrainFighter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "TrainFighter", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::TrainFighter));
 tableOrder.insert(std::pair<int, const Order*>(Orders::TrainFighter.getID(), &Orders::TrainFighter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InterceptorAttack", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InterceptorAttack));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InterceptorAttack", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InterceptorAttack));
 tableOrder.insert(std::pair<int, const Order*>(Orders::InterceptorAttack.getID(), &Orders::InterceptorAttack));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ScarabAttack", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ScarabAttack));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ScarabAttack", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ScarabAttack));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ScarabAttack.getID(), &Orders::ScarabAttack));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RechargeShieldsUnit", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RechargeShieldsUnit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RechargeShieldsUnit", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RechargeShieldsUnit));
 tableOrder.insert(std::pair<int, const Order*>(Orders::RechargeShieldsUnit.getID(), &Orders::RechargeShieldsUnit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RechargeShieldsBattery", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RechargeShieldsBattery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RechargeShieldsBattery", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RechargeShieldsBattery));
 tableOrder.insert(std::pair<int, const Order*>(Orders::RechargeShieldsBattery.getID(), &Orders::RechargeShieldsBattery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ShieldBattery", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ShieldBattery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ShieldBattery", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ShieldBattery));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ShieldBattery.getID(), &Orders::ShieldBattery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InterceptorReturn", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InterceptorReturn));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InterceptorReturn", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InterceptorReturn));
 tableOrder.insert(std::pair<int, const Order*>(Orders::InterceptorReturn.getID(), &Orders::InterceptorReturn));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildingLand", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildingLand));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildingLand", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildingLand));
 tableOrder.insert(std::pair<int, const Order*>(Orders::BuildingLand.getID(), &Orders::BuildingLand));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildingLiftOff", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildingLiftOff));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "BuildingLiftOff", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::BuildingLiftOff));
 tableOrder.insert(std::pair<int, const Order*>(Orders::BuildingLiftOff.getID(), &Orders::BuildingLiftOff));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "DroneLiftOff", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::DroneLiftOff));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "DroneLiftOff", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::DroneLiftOff));
 tableOrder.insert(std::pair<int, const Order*>(Orders::DroneLiftOff.getID(), &Orders::DroneLiftOff));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "LiftingOff", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::LiftingOff));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "LiftingOff", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::LiftingOff));
 tableOrder.insert(std::pair<int, const Order*>(Orders::LiftingOff.getID(), &Orders::LiftingOff));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ResearchTech", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ResearchTech));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ResearchTech", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ResearchTech));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ResearchTech.getID(), &Orders::ResearchTech));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Upgrade", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Upgrade));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Upgrade", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Upgrade));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Upgrade.getID(), &Orders::Upgrade));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Larva", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Larva));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Larva", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Larva));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Larva.getID(), &Orders::Larva));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "SpawningLarva", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::SpawningLarva));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "SpawningLarva", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::SpawningLarva));
 tableOrder.insert(std::pair<int, const Order*>(Orders::SpawningLarva.getID(), &Orders::SpawningLarva));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest1", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest1));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest1", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest1));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Harvest1.getID(), &Orders::Harvest1));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest2", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest2", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest2));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Harvest2.getID(), &Orders::Harvest2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MoveToGas", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MoveToGas));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MoveToGas", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MoveToGas));
 tableOrder.insert(std::pair<int, const Order*>(Orders::MoveToGas.getID(), &Orders::MoveToGas));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "WaitForGas", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::WaitForGas));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "WaitForGas", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::WaitForGas));
 tableOrder.insert(std::pair<int, const Order*>(Orders::WaitForGas.getID(), &Orders::WaitForGas));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HarvestGas", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HarvestGas));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HarvestGas", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HarvestGas));
 tableOrder.insert(std::pair<int, const Order*>(Orders::HarvestGas.getID(), &Orders::HarvestGas));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ReturnGas", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ReturnGas));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ReturnGas", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ReturnGas));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ReturnGas.getID(), &Orders::ReturnGas));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MoveToMinerals", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MoveToMinerals));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MoveToMinerals", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MoveToMinerals));
 tableOrder.insert(std::pair<int, const Order*>(Orders::MoveToMinerals.getID(), &Orders::MoveToMinerals));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "WaitForMinerals", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::WaitForMinerals));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "WaitForMinerals", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::WaitForMinerals));
 tableOrder.insert(std::pair<int, const Order*>(Orders::WaitForMinerals.getID(), &Orders::WaitForMinerals));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MiningMinerals", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MiningMinerals));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MiningMinerals", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MiningMinerals));
 tableOrder.insert(std::pair<int, const Order*>(Orders::MiningMinerals.getID(), &Orders::MiningMinerals));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest3", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest3));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest3", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest3));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Harvest3.getID(), &Orders::Harvest3));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest4", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest4));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Harvest4", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Harvest4));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Harvest4.getID(), &Orders::Harvest4));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ReturnMinerals", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ReturnMinerals));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ReturnMinerals", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ReturnMinerals));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ReturnMinerals.getID(), &Orders::ReturnMinerals));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Interrupted", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Interrupted));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Interrupted", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Interrupted));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Interrupted.getID(), &Orders::Interrupted));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EnterTransport", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::EnterTransport));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EnterTransport", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::EnterTransport));
 tableOrder.insert(std::pair<int, const Order*>(Orders::EnterTransport.getID(), &Orders::EnterTransport));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PickupIdle", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PickupIdle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PickupIdle", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PickupIdle));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PickupIdle.getID(), &Orders::PickupIdle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PickupTransport", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PickupTransport));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PickupTransport", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PickupTransport));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PickupTransport.getID(), &Orders::PickupTransport));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PickupBunker", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PickupBunker));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PickupBunker", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PickupBunker));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PickupBunker.getID(), &Orders::PickupBunker));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pickup4", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Pickup4));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pickup4", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Pickup4));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Pickup4.getID(), &Orders::Pickup4));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PowerupIdle", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PowerupIdle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PowerupIdle", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PowerupIdle));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PowerupIdle.getID(), &Orders::PowerupIdle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sieging", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Sieging));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sieging", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Sieging));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Sieging.getID(), &Orders::Sieging));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unsieging", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unsieging));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unsieging", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unsieging));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Unsieging.getID(), &Orders::Unsieging));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InitCreepGrowth", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InitCreepGrowth));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "InitCreepGrowth", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::InitCreepGrowth));
 tableOrder.insert(std::pair<int, const Order*>(Orders::InitCreepGrowth.getID(), &Orders::InitCreepGrowth));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "SpreadCreep", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::SpreadCreep));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "SpreadCreep", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::SpreadCreep));
 tableOrder.insert(std::pair<int, const Order*>(Orders::SpreadCreep.getID(), &Orders::SpreadCreep));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "StoppingCreepGrowth", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::StoppingCreepGrowth));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "StoppingCreepGrowth", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::StoppingCreepGrowth));
 tableOrder.insert(std::pair<int, const Order*>(Orders::StoppingCreepGrowth.getID(), &Orders::StoppingCreepGrowth));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "GuardianAspect", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::GuardianAspect));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "GuardianAspect", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::GuardianAspect));
 tableOrder.insert(std::pair<int, const Order*>(Orders::GuardianAspect.getID(), &Orders::GuardianAspect));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ArchonWarp", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ArchonWarp));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ArchonWarp", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ArchonWarp));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ArchonWarp.getID(), &Orders::ArchonWarp));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CompletingArchonSummon", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CompletingArchonSummon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CompletingArchonSummon", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CompletingArchonSummon));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CompletingArchonSummon.getID(), &Orders::CompletingArchonSummon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HoldPosition", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HoldPosition));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HoldPosition", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HoldPosition));
 tableOrder.insert(std::pair<int, const Order*>(Orders::HoldPosition.getID(), &Orders::HoldPosition));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cloak", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Cloak));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cloak", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Cloak));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Cloak.getID(), &Orders::Cloak));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Decloak", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Decloak));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Decloak", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Decloak));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Decloak.getID(), &Orders::Decloak));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unload));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unload));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Unload.getID(), &Orders::Unload));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MoveUnload", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MoveUnload));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MoveUnload", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MoveUnload));
 tableOrder.insert(std::pair<int, const Order*>(Orders::MoveUnload.getID(), &Orders::MoveUnload));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "FireYamatoGun", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::FireYamatoGun));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "FireYamatoGun", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::FireYamatoGun));
 tableOrder.insert(std::pair<int, const Order*>(Orders::FireYamatoGun.getID(), &Orders::FireYamatoGun));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastLockdown", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastLockdown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastLockdown", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastLockdown));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastLockdown.getID(), &Orders::CastLockdown));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrowing", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Burrowing));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrowing", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Burrowing));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Burrowing.getID(), &Orders::Burrowing));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrowed", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Burrowed));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrowed", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Burrowed));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Burrowed.getID(), &Orders::Burrowed));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unburrowing", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unburrowing));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unburrowing", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unburrowing));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Unburrowing.getID(), &Orders::Unburrowing));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastDarkSwarm", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastDarkSwarm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastDarkSwarm", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastDarkSwarm));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastDarkSwarm.getID(), &Orders::CastDarkSwarm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastParasite", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastParasite));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastParasite", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastParasite));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastParasite.getID(), &Orders::CastParasite));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastSpawnBroodlings", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastSpawnBroodlings));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastSpawnBroodlings", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastSpawnBroodlings));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastSpawnBroodlings.getID(), &Orders::CastSpawnBroodlings));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastEMPShockwave", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastEMPShockwave));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastEMPShockwave", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastEMPShockwave));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastEMPShockwave.getID(), &Orders::CastEMPShockwave));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeWait", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeWait));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeWait", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeWait));
 tableOrder.insert(std::pair<int, const Order*>(Orders::NukeWait.getID(), &Orders::NukeWait));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeTrain", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeTrain));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeTrain", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeTrain));
 tableOrder.insert(std::pair<int, const Order*>(Orders::NukeTrain.getID(), &Orders::NukeTrain));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeLaunch", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeLaunch));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeLaunch", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeLaunch));
 tableOrder.insert(std::pair<int, const Order*>(Orders::NukeLaunch.getID(), &Orders::NukeLaunch));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukePaint", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukePaint));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukePaint", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukePaint));
 tableOrder.insert(std::pair<int, const Order*>(Orders::NukePaint.getID(), &Orders::NukePaint));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeUnit", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeUnit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeUnit", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeUnit));
 tableOrder.insert(std::pair<int, const Order*>(Orders::NukeUnit.getID(), &Orders::NukeUnit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastNuclearStrike", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastNuclearStrike));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastNuclearStrike", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastNuclearStrike));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastNuclearStrike.getID(), &Orders::CastNuclearStrike));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeTrack", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeTrack));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "NukeTrack", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::NukeTrack));
 tableOrder.insert(std::pair<int, const Order*>(Orders::NukeTrack.getID(), &Orders::NukeTrack));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CloakNearbyUnits", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CloakNearbyUnits));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CloakNearbyUnits", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CloakNearbyUnits));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CloakNearbyUnits.getID(), &Orders::CloakNearbyUnits));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlaceMine", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlaceMine));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlaceMine", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::PlaceMine));
 tableOrder.insert(std::pair<int, const Order*>(Orders::PlaceMine.getID(), &Orders::PlaceMine));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RightClickAction", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RightClickAction));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RightClickAction", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RightClickAction));
 tableOrder.insert(std::pair<int, const Order*>(Orders::RightClickAction.getID(), &Orders::RightClickAction));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastRecall", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastRecall));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastRecall", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastRecall));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastRecall.getID(), &Orders::CastRecall));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Teleport", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Teleport));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Teleport", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Teleport));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Teleport.getID(), &Orders::Teleport));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastScannerSweep", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastScannerSweep));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastScannerSweep", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastScannerSweep));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastScannerSweep.getID(), &Orders::CastScannerSweep));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scanner", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Scanner));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scanner", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Scanner));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Scanner.getID(), &Orders::Scanner));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastDefensiveMatrix", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastDefensiveMatrix));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastDefensiveMatrix", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastDefensiveMatrix));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastDefensiveMatrix.getID(), &Orders::CastDefensiveMatrix));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastPsionicStorm", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastPsionicStorm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastPsionicStorm", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastPsionicStorm));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastPsionicStorm.getID(), &Orders::CastPsionicStorm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastIrradiate", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastIrradiate));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastIrradiate", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastIrradiate));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastIrradiate.getID(), &Orders::CastIrradiate));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastPlague", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastPlague));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastPlague", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastPlague));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastPlague.getID(), &Orders::CastPlague));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastConsume", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastConsume));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastConsume", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastConsume));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastConsume.getID(), &Orders::CastConsume));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastEnsnare", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastEnsnare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastEnsnare", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastEnsnare));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastEnsnare.getID(), &Orders::CastEnsnare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastStasisField", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastStasisField));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastStasisField", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastStasisField));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastStasisField.getID(), &Orders::CastStasisField));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastHallucination", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastHallucination));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastHallucination", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastHallucination));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastHallucination.getID(), &Orders::CastHallucination));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hallucination2", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Hallucination2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hallucination2", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Hallucination2));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Hallucination2.getID(), &Orders::Hallucination2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ResetCollision", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ResetCollision));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ResetCollision", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ResetCollision));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ResetCollision.getID(), &Orders::ResetCollision));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Patrol", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Patrol));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Patrol", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Patrol));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Patrol.getID(), &Orders::Patrol));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CTFCOPInit", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CTFCOPInit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CTFCOPInit", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CTFCOPInit));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CTFCOPInit.getID(), &Orders::CTFCOPInit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CTFCOPStarted", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CTFCOPStarted));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CTFCOPStarted", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CTFCOPStarted));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CTFCOPStarted.getID(), &Orders::CTFCOPStarted));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CTFCOP2", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CTFCOP2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CTFCOP2", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CTFCOP2));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CTFCOP2.getID(), &Orders::CTFCOP2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ComputerAI", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ComputerAI));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ComputerAI", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ComputerAI));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ComputerAI.getID(), &Orders::ComputerAI));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AtkMoveEP", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AtkMoveEP));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AtkMoveEP", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AtkMoveEP));
 tableOrder.insert(std::pair<int, const Order*>(Orders::AtkMoveEP.getID(), &Orders::AtkMoveEP));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HarassMove", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HarassMove));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HarassMove", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HarassMove));
 tableOrder.insert(std::pair<int, const Order*>(Orders::HarassMove.getID(), &Orders::HarassMove));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AIPatrol", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AIPatrol));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AIPatrol", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::AIPatrol));
 tableOrder.insert(std::pair<int, const Order*>(Orders::AIPatrol.getID(), &Orders::AIPatrol));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "GuardPost", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::GuardPost));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "GuardPost", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::GuardPost));
 tableOrder.insert(std::pair<int, const Order*>(Orders::GuardPost.getID(), &Orders::GuardPost));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RescuePassive", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RescuePassive));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RescuePassive", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RescuePassive));
 tableOrder.insert(std::pair<int, const Order*>(Orders::RescuePassive.getID(), &Orders::RescuePassive));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutral", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Neutral));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutral", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Neutral));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Neutral.getID(), &Orders::Neutral));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ComputerReturn", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ComputerReturn));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ComputerReturn", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::ComputerReturn));
 tableOrder.insert(std::pair<int, const Order*>(Orders::ComputerReturn.getID(), &Orders::ComputerReturn));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "SelfDestructing", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::SelfDestructing));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "SelfDestructing", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::SelfDestructing));
 tableOrder.insert(std::pair<int, const Order*>(Orders::SelfDestructing.getID(), &Orders::SelfDestructing));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Critter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Critter));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Critter.getID(), &Orders::Critter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HiddenGun", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HiddenGun));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HiddenGun", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HiddenGun));
 tableOrder.insert(std::pair<int, const Order*>(Orders::HiddenGun.getID(), &Orders::HiddenGun));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "OpenDoor", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::OpenDoor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "OpenDoor", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::OpenDoor));
 tableOrder.insert(std::pair<int, const Order*>(Orders::OpenDoor.getID(), &Orders::OpenDoor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CloseDoor", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CloseDoor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CloseDoor", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CloseDoor));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CloseDoor.getID(), &Orders::CloseDoor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HideTrap", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HideTrap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HideTrap", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HideTrap));
 tableOrder.insert(std::pair<int, const Order*>(Orders::HideTrap.getID(), &Orders::HideTrap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RevealTrap", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RevealTrap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RevealTrap", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::RevealTrap));
 tableOrder.insert(std::pair<int, const Order*>(Orders::RevealTrap.getID(), &Orders::RevealTrap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EnableDoodad", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::EnableDoodad));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EnableDoodad", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::EnableDoodad));
 tableOrder.insert(std::pair<int, const Order*>(Orders::EnableDoodad.getID(), &Orders::EnableDoodad));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "DisableDoodad", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::DisableDoodad));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "DisableDoodad", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::DisableDoodad));
 tableOrder.insert(std::pair<int, const Order*>(Orders::DisableDoodad.getID(), &Orders::DisableDoodad));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "WarpIn", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::WarpIn));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "WarpIn", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::WarpIn));
 tableOrder.insert(std::pair<int, const Order*>(Orders::WarpIn.getID(), &Orders::WarpIn));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Medic", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Medic));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Medic", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Medic));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Medic.getID(), &Orders::Medic));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MedicHeal", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MedicHeal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MedicHeal", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MedicHeal));
 tableOrder.insert(std::pair<int, const Order*>(Orders::MedicHeal.getID(), &Orders::MedicHeal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HealMove", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HealMove));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "HealMove", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::HealMove));
 tableOrder.insert(std::pair<int, const Order*>(Orders::HealMove.getID(), &Orders::HealMove));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MedicHealToIdle", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MedicHealToIdle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "MedicHealToIdle", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::MedicHealToIdle));
 tableOrder.insert(std::pair<int, const Order*>(Orders::MedicHealToIdle.getID(), &Orders::MedicHealToIdle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastRestoration", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastRestoration));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastRestoration", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastRestoration));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastRestoration.getID(), &Orders::CastRestoration));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastDisruptionWeb", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastDisruptionWeb));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastDisruptionWeb", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastDisruptionWeb));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastDisruptionWeb.getID(), &Orders::CastDisruptionWeb));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastMindControl", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastMindControl));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastMindControl", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastMindControl));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastMindControl.getID(), &Orders::CastMindControl));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "DarkArchonMeld", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::DarkArchonMeld));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "DarkArchonMeld", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::DarkArchonMeld));
 tableOrder.insert(std::pair<int, const Order*>(Orders::DarkArchonMeld.getID(), &Orders::DarkArchonMeld));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastFeedback", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastFeedback));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastFeedback", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastFeedback));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastFeedback.getID(), &Orders::CastFeedback));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastOpticalFlare", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastOpticalFlare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastOpticalFlare", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastOpticalFlare));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastOpticalFlare.getID(), &Orders::CastOpticalFlare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastMaelstrom", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastMaelstrom));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "CastMaelstrom", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::CastMaelstrom));
 tableOrder.insert(std::pair<int, const Order*>(Orders::CastMaelstrom.getID(), &Orders::CastMaelstrom));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "JunkYardDog", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::JunkYardDog));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "JunkYardDog", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::JunkYardDog));
 tableOrder.insert(std::pair<int, const Order*>(Orders::JunkYardDog.getID(), &Orders::JunkYardDog));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fatal", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Fatal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fatal", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Fatal));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Fatal.getID(), &Orders::Fatal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::None));
 tableOrder.insert(std::pair<int, const Order*>(Orders::None.getID(), &Orders::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/Order;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Orders::Unknown));
 tableOrder.insert(std::pair<int, const Order*>(Orders::Unknown.getID(), &Orders::Unknown));
-cls = env->FindClass("Lbwapi4/PlayerType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/PlayerType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::None));
+cls = env->FindClass("Lbwapi/PlayerType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/PlayerType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::None));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::None.getID(), &PlayerTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Computer", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Computer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Computer", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Computer));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::Computer.getID(), &PlayerTypes::Computer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Player", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Player));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Player", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Player));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::Player.getID(), &PlayerTypes::Player));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RescuePassive", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::RescuePassive));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "RescuePassive", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::RescuePassive));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::RescuePassive.getID(), &PlayerTypes::RescuePassive));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EitherPreferComputer", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::EitherPreferComputer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EitherPreferComputer", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::EitherPreferComputer));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::EitherPreferComputer.getID(), &PlayerTypes::EitherPreferComputer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EitherPreferHuman", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::EitherPreferHuman));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EitherPreferHuman", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::EitherPreferHuman));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::EitherPreferHuman.getID(), &PlayerTypes::EitherPreferHuman));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutral", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Neutral));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutral", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Neutral));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::Neutral.getID(), &PlayerTypes::Neutral));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Closed", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Closed));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Closed", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Closed));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::Closed.getID(), &PlayerTypes::Closed));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlayerLeft", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::PlayerLeft));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "PlayerLeft", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::PlayerLeft));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::PlayerLeft.getID(), &PlayerTypes::PlayerLeft));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ComputerLeft", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::ComputerLeft));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ComputerLeft", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::ComputerLeft));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::ComputerLeft.getID(), &PlayerTypes::ComputerLeft));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/PlayerType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&PlayerTypes::Unknown));
 tablePlayerType.insert(std::pair<int, const PlayerType*>(PlayerTypes::Unknown.getID(), &PlayerTypes::Unknown));
-cls = env->FindClass("Lbwapi4/Race;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/Race;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg", "Lbwapi4/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Zerg));
+cls = env->FindClass("Lbwapi/Race;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/Race;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg", "Lbwapi/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Zerg));
 tableRace.insert(std::pair<int, const Race*>(Races::Zerg.getID(), &Races::Zerg));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran", "Lbwapi4/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Terran));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran", "Lbwapi/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Terran));
 tableRace.insert(std::pair<int, const Race*>(Races::Terran.getID(), &Races::Terran));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss", "Lbwapi4/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Protoss));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss", "Lbwapi/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Protoss));
 tableRace.insert(std::pair<int, const Race*>(Races::Protoss.getID(), &Races::Protoss));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Random", "Lbwapi4/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Random));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Random", "Lbwapi/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Random));
 tableRace.insert(std::pair<int, const Race*>(Races::Random.getID(), &Races::Random));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::None));
 tableRace.insert(std::pair<int, const Race*>(Races::None.getID(), &Races::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/Race;"), env->CallStaticObjectMethod(cls, getId, (jlong)&Races::Unknown));
 tableRace.insert(std::pair<int, const Race*>(Races::Unknown.getID(), &Races::Unknown));
-cls = env->FindClass("Lbwapi4/TechType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/TechType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stim_Packs", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Stim_Packs));
+cls = env->FindClass("Lbwapi/TechType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/TechType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stim_Packs", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Stim_Packs));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Stim_Packs.getID(), &TechTypes::Stim_Packs));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lockdown", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Lockdown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lockdown", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Lockdown));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Lockdown.getID(), &TechTypes::Lockdown));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Shockwave", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::EMP_Shockwave));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Shockwave", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::EMP_Shockwave));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::EMP_Shockwave.getID(), &TechTypes::EMP_Shockwave));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spider_Mines", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Spider_Mines));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spider_Mines", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Spider_Mines));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Spider_Mines.getID(), &TechTypes::Spider_Mines));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scanner_Sweep", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Scanner_Sweep));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scanner_Sweep", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Scanner_Sweep));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Scanner_Sweep.getID(), &TechTypes::Scanner_Sweep));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Tank_Siege_Mode", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Tank_Siege_Mode));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Tank_Siege_Mode", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Tank_Siege_Mode));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Tank_Siege_Mode.getID(), &TechTypes::Tank_Siege_Mode));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Defensive_Matrix", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Defensive_Matrix));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Defensive_Matrix", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Defensive_Matrix));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Defensive_Matrix.getID(), &TechTypes::Defensive_Matrix));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Irradiate", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Irradiate));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Irradiate", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Irradiate));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Irradiate.getID(), &TechTypes::Irradiate));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Yamato_Gun));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Yamato_Gun));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Yamato_Gun.getID(), &TechTypes::Yamato_Gun));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cloaking_Field", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Cloaking_Field));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cloaking_Field", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Cloaking_Field));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Cloaking_Field.getID(), &TechTypes::Cloaking_Field));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Personnel_Cloaking", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Personnel_Cloaking));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Personnel_Cloaking", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Personnel_Cloaking));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Personnel_Cloaking.getID(), &TechTypes::Personnel_Cloaking));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrowing", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Burrowing));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrowing", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Burrowing));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Burrowing.getID(), &TechTypes::Burrowing));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Infestation", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Infestation));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Infestation", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Infestation));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Infestation.getID(), &TechTypes::Infestation));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spawn_Broodlings", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Spawn_Broodlings));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spawn_Broodlings", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Spawn_Broodlings));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Spawn_Broodlings.getID(), &TechTypes::Spawn_Broodlings));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Swarm", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Dark_Swarm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Swarm", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Dark_Swarm));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Dark_Swarm.getID(), &TechTypes::Dark_Swarm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Plague));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Plague));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Plague.getID(), &TechTypes::Plague));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Consume));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Consume));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Consume.getID(), &TechTypes::Consume));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Ensnare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Ensnare));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Ensnare.getID(), &TechTypes::Ensnare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Parasite", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Parasite));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Parasite", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Parasite));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Parasite.getID(), &TechTypes::Parasite));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Storm", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Psionic_Storm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Storm", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Psionic_Storm));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Psionic_Storm.getID(), &TechTypes::Psionic_Storm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hallucination", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Hallucination));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hallucination", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Hallucination));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Hallucination.getID(), &TechTypes::Hallucination));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Recall", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Recall));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Recall", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Recall));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Recall.getID(), &TechTypes::Recall));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stasis_Field", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Stasis_Field));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stasis_Field", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Stasis_Field));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Stasis_Field.getID(), &TechTypes::Stasis_Field));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Archon_Warp", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Archon_Warp));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Archon_Warp", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Archon_Warp));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Archon_Warp.getID(), &TechTypes::Archon_Warp));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Restoration", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Restoration));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Restoration", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Restoration));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Restoration.getID(), &TechTypes::Restoration));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Disruption_Web", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Disruption_Web));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Disruption_Web", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Disruption_Web));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Disruption_Web.getID(), &TechTypes::Disruption_Web));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Mind_Control", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Mind_Control));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Mind_Control", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Mind_Control));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Mind_Control.getID(), &TechTypes::Mind_Control));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Archon_Meld", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Dark_Archon_Meld));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Archon_Meld", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Dark_Archon_Meld));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Dark_Archon_Meld.getID(), &TechTypes::Dark_Archon_Meld));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Feedback", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Feedback));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Feedback", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Feedback));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Feedback.getID(), &TechTypes::Feedback));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Optical_Flare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Optical_Flare));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Optical_Flare.getID(), &TechTypes::Optical_Flare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Maelstrom", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Maelstrom));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Maelstrom", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Maelstrom));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Maelstrom.getID(), &TechTypes::Maelstrom));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lurker_Aspect", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Lurker_Aspect));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lurker_Aspect", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Lurker_Aspect));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Lurker_Aspect.getID(), &TechTypes::Lurker_Aspect));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Healing", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Healing));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Healing", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Healing));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Healing.getID(), &TechTypes::Healing));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::None));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::None.getID(), &TechTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nuclear_Strike", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Nuclear_Strike));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nuclear_Strike", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Nuclear_Strike));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Nuclear_Strike.getID(), &TechTypes::Nuclear_Strike));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/TechType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&TechTypes::Unknown));
 tableTechType.insert(std::pair<int, const TechType*>(TechTypes::Unknown.getID(), &TechTypes::Unknown));
-cls = env->FindClass("Lbwapi4/UnitCommandType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/UnitCommandType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Attack_Move", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Attack_Move));
+cls = env->FindClass("Lbwapi/UnitCommandType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/UnitCommandType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Attack_Move", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Attack_Move));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Attack_Move.getID(), &UnitCommandTypes::Attack_Move));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Attack_Unit", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Attack_Unit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Attack_Unit", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Attack_Unit));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Attack_Unit.getID(), &UnitCommandTypes::Attack_Unit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Build", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Build));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Build", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Build));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Build.getID(), &UnitCommandTypes::Build));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Build_Addon", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Build_Addon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Build_Addon", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Build_Addon));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Build_Addon.getID(), &UnitCommandTypes::Build_Addon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Train", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Train));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Train", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Train));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Train.getID(), &UnitCommandTypes::Train));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Morph", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Morph));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Morph", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Morph));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Morph.getID(), &UnitCommandTypes::Morph));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Research", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Research));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Research", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Research));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Research.getID(), &UnitCommandTypes::Research));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Upgrade", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Upgrade));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Upgrade", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Upgrade));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Upgrade.getID(), &UnitCommandTypes::Upgrade));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Set_Rally_Position", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Set_Rally_Position));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Set_Rally_Position", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Set_Rally_Position));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Set_Rally_Position.getID(), &UnitCommandTypes::Set_Rally_Position));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Set_Rally_Unit", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Set_Rally_Unit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Set_Rally_Unit", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Set_Rally_Unit));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Set_Rally_Unit.getID(), &UnitCommandTypes::Set_Rally_Unit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Move", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Move));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Move", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Move));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Move.getID(), &UnitCommandTypes::Move));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Patrol", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Patrol));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Patrol", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Patrol));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Patrol.getID(), &UnitCommandTypes::Patrol));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hold_Position", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Hold_Position));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hold_Position", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Hold_Position));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Hold_Position.getID(), &UnitCommandTypes::Hold_Position));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stop", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Stop));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stop", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Stop));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Stop.getID(), &UnitCommandTypes::Stop));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Follow", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Follow));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Follow", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Follow));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Follow.getID(), &UnitCommandTypes::Follow));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gather", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Gather));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gather", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Gather));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Gather.getID(), &UnitCommandTypes::Gather));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Return_Cargo", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Return_Cargo));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Return_Cargo", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Return_Cargo));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Return_Cargo.getID(), &UnitCommandTypes::Return_Cargo));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Repair", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Repair));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Repair", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Repair));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Repair.getID(), &UnitCommandTypes::Repair));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrow", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Burrow));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burrow", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Burrow));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Burrow.getID(), &UnitCommandTypes::Burrow));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unburrow", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unburrow));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unburrow", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unburrow));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Unburrow.getID(), &UnitCommandTypes::Unburrow));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cloak", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cloak));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cloak", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cloak));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cloak.getID(), &UnitCommandTypes::Cloak));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Decloak", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Decloak));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Decloak", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Decloak));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Decloak.getID(), &UnitCommandTypes::Decloak));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Siege", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Siege));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Siege", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Siege));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Siege.getID(), &UnitCommandTypes::Siege));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unsiege", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unsiege));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unsiege", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unsiege));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Unsiege.getID(), &UnitCommandTypes::Unsiege));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lift", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Lift));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lift", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Lift));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Lift.getID(), &UnitCommandTypes::Lift));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Land", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Land));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Land", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Land));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Land.getID(), &UnitCommandTypes::Land));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Load", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Load));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Load", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Load));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Load.getID(), &UnitCommandTypes::Load));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unload));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unload));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Unload.getID(), &UnitCommandTypes::Unload));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload_All", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unload_All));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload_All", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unload_All));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Unload_All.getID(), &UnitCommandTypes::Unload_All));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload_All_Position", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unload_All_Position));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unload_All_Position", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unload_All_Position));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Unload_All_Position.getID(), &UnitCommandTypes::Unload_All_Position));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Right_Click_Position", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Right_Click_Position));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Right_Click_Position", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Right_Click_Position));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Right_Click_Position.getID(), &UnitCommandTypes::Right_Click_Position));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Right_Click_Unit", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Right_Click_Unit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Right_Click_Unit", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Right_Click_Unit));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Right_Click_Unit.getID(), &UnitCommandTypes::Right_Click_Unit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Halt_Construction", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Halt_Construction));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Halt_Construction", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Halt_Construction));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Halt_Construction.getID(), &UnitCommandTypes::Halt_Construction));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Construction", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Construction));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Construction", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Construction));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cancel_Construction.getID(), &UnitCommandTypes::Cancel_Construction));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Addon", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Addon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Addon", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Addon));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cancel_Addon.getID(), &UnitCommandTypes::Cancel_Addon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Train", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Train));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Train", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Train));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cancel_Train.getID(), &UnitCommandTypes::Cancel_Train));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Train_Slot", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Train_Slot));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Train_Slot", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Train_Slot));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cancel_Train_Slot.getID(), &UnitCommandTypes::Cancel_Train_Slot));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Morph", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Morph));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Morph", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Morph));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cancel_Morph.getID(), &UnitCommandTypes::Cancel_Morph));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Research", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Research));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Research", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Research));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cancel_Research.getID(), &UnitCommandTypes::Cancel_Research));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Upgrade", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Upgrade));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Cancel_Upgrade", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Cancel_Upgrade));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Cancel_Upgrade.getID(), &UnitCommandTypes::Cancel_Upgrade));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Tech", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Use_Tech));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Tech", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Use_Tech));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Use_Tech.getID(), &UnitCommandTypes::Use_Tech));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Tech_Position", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Use_Tech_Position));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Tech_Position", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Use_Tech_Position));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Use_Tech_Position.getID(), &UnitCommandTypes::Use_Tech_Position));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Tech_Unit", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Use_Tech_Unit));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Use_Tech_Unit", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Use_Tech_Unit));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Use_Tech_Unit.getID(), &UnitCommandTypes::Use_Tech_Unit));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Place_COP", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Place_COP));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Place_COP", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Place_COP));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Place_COP.getID(), &UnitCommandTypes::Place_COP));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::None));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::None.getID(), &UnitCommandTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/UnitCommandType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitCommandTypes::Unknown));
 tableUnitCommandType.insert(std::pair<int, const UnitCommandType*>(UnitCommandTypes::Unknown.getID(), &UnitCommandTypes::Unknown));
-cls = env->FindClass("Lbwapi4/UnitSizeType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/UnitSizeType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Independent", "Lbwapi4/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Independent));
+cls = env->FindClass("Lbwapi/UnitSizeType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/UnitSizeType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Independent", "Lbwapi/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Independent));
 tableUnitSizeType.insert(std::pair<int, const UnitSizeType*>(UnitSizeTypes::Independent.getID(), &UnitSizeTypes::Independent));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Small", "Lbwapi4/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Small));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Small", "Lbwapi/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Small));
 tableUnitSizeType.insert(std::pair<int, const UnitSizeType*>(UnitSizeTypes::Small.getID(), &UnitSizeTypes::Small));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Medium", "Lbwapi4/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Medium));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Medium", "Lbwapi/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Medium));
 tableUnitSizeType.insert(std::pair<int, const UnitSizeType*>(UnitSizeTypes::Medium.getID(), &UnitSizeTypes::Medium));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Large", "Lbwapi4/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Large));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Large", "Lbwapi/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Large));
 tableUnitSizeType.insert(std::pair<int, const UnitSizeType*>(UnitSizeTypes::Large.getID(), &UnitSizeTypes::Large));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::None));
 tableUnitSizeType.insert(std::pair<int, const UnitSizeType*>(UnitSizeTypes::None.getID(), &UnitSizeTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/UnitSizeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitSizeTypes::Unknown));
 tableUnitSizeType.insert(std::pair<int, const UnitSizeType*>(UnitSizeTypes::Unknown.getID(), &UnitSizeTypes::Unknown));
-cls = env->FindClass("Lbwapi4/UnitType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/UnitType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Marine", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Marine));
+cls = env->FindClass("Lbwapi/UnitType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/UnitType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Marine", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Marine));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Marine.getID(), &UnitTypes::Terran_Marine));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Ghost", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Ghost));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Ghost", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Ghost));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Ghost.getID(), &UnitTypes::Terran_Ghost));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vulture", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Vulture));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vulture", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Vulture));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Vulture.getID(), &UnitTypes::Terran_Vulture));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Goliath", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Goliath));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Goliath", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Goliath));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Goliath.getID(), &UnitTypes::Terran_Goliath));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Siege_Tank_Tank_Mode", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Siege_Tank_Tank_Mode));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Siege_Tank_Tank_Mode", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Siege_Tank_Tank_Mode));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Siege_Tank_Tank_Mode.getID(), &UnitTypes::Terran_Siege_Tank_Tank_Mode));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_SCV", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_SCV));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_SCV", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_SCV));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_SCV.getID(), &UnitTypes::Terran_SCV));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Wraith", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Wraith));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Wraith", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Wraith));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Wraith.getID(), &UnitTypes::Terran_Wraith));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Science_Vessel", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Science_Vessel));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Science_Vessel", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Science_Vessel));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Science_Vessel.getID(), &UnitTypes::Terran_Science_Vessel));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Gui_Montag", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Gui_Montag));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Gui_Montag", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Gui_Montag));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Gui_Montag.getID(), &UnitTypes::Hero_Gui_Montag));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Dropship", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Dropship));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Dropship", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Dropship));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Dropship.getID(), &UnitTypes::Terran_Dropship));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Battlecruiser", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Battlecruiser));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Battlecruiser", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Battlecruiser));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Battlecruiser.getID(), &UnitTypes::Terran_Battlecruiser));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vulture_Spider_Mine", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Vulture_Spider_Mine));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vulture_Spider_Mine", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Vulture_Spider_Mine));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Vulture_Spider_Mine.getID(), &UnitTypes::Terran_Vulture_Spider_Mine));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Nuclear_Missile", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Nuclear_Missile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Nuclear_Missile", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Nuclear_Missile));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Nuclear_Missile.getID(), &UnitTypes::Terran_Nuclear_Missile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Civilian", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Civilian));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Civilian", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Civilian));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Civilian.getID(), &UnitTypes::Terran_Civilian));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Sarah_Kerrigan", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Sarah_Kerrigan));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Sarah_Kerrigan", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Sarah_Kerrigan));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Sarah_Kerrigan.getID(), &UnitTypes::Hero_Sarah_Kerrigan));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Alan_Schezar", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Alan_Schezar));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Alan_Schezar", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Alan_Schezar));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Alan_Schezar.getID(), &UnitTypes::Hero_Alan_Schezar));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Jim_Raynor_Vulture", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Jim_Raynor_Vulture));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Jim_Raynor_Vulture", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Jim_Raynor_Vulture));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Jim_Raynor_Vulture.getID(), &UnitTypes::Hero_Jim_Raynor_Vulture));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Jim_Raynor_Marine", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Jim_Raynor_Marine));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Jim_Raynor_Marine", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Jim_Raynor_Marine));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Jim_Raynor_Marine.getID(), &UnitTypes::Hero_Jim_Raynor_Marine));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Tom_Kazansky", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Tom_Kazansky));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Tom_Kazansky", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Tom_Kazansky));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Tom_Kazansky.getID(), &UnitTypes::Hero_Tom_Kazansky));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Magellan", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Magellan));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Magellan", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Magellan));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Magellan.getID(), &UnitTypes::Hero_Magellan));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Edmund_Duke_Tank_Mode", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Edmund_Duke_Tank_Mode));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Edmund_Duke_Tank_Mode", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Edmund_Duke_Tank_Mode));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Edmund_Duke_Tank_Mode.getID(), &UnitTypes::Hero_Edmund_Duke_Tank_Mode));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Edmund_Duke_Siege_Mode", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Edmund_Duke_Siege_Mode));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Edmund_Duke_Siege_Mode", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Edmund_Duke_Siege_Mode));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Edmund_Duke_Siege_Mode.getID(), &UnitTypes::Hero_Edmund_Duke_Siege_Mode));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Arcturus_Mengsk", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Arcturus_Mengsk));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Arcturus_Mengsk", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Arcturus_Mengsk));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Arcturus_Mengsk.getID(), &UnitTypes::Hero_Arcturus_Mengsk));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Hyperion", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Hyperion));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Hyperion", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Hyperion));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Hyperion.getID(), &UnitTypes::Hero_Hyperion));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Norad_II", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Norad_II));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Norad_II", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Norad_II));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Norad_II.getID(), &UnitTypes::Hero_Norad_II));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Siege_Tank_Siege_Mode", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Siege_Tank_Siege_Mode));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Siege_Tank_Siege_Mode", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Siege_Tank_Siege_Mode));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Siege_Tank_Siege_Mode.getID(), &UnitTypes::Terran_Siege_Tank_Siege_Mode));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Firebat", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Firebat));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Firebat", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Firebat));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Firebat.getID(), &UnitTypes::Terran_Firebat));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spell_Scanner_Sweep", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Spell_Scanner_Sweep));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spell_Scanner_Sweep", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Spell_Scanner_Sweep));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Spell_Scanner_Sweep.getID(), &UnitTypes::Spell_Scanner_Sweep));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Medic", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Medic));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Medic", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Medic));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Medic.getID(), &UnitTypes::Terran_Medic));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Larva", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Larva));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Larva", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Larva));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Larva.getID(), &UnitTypes::Zerg_Larva));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Egg", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Egg));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Egg", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Egg));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Egg.getID(), &UnitTypes::Zerg_Egg));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Zergling", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Zergling));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Zergling", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Zergling));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Zergling.getID(), &UnitTypes::Zerg_Zergling));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hydralisk", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hydralisk));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hydralisk", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hydralisk));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Hydralisk.getID(), &UnitTypes::Zerg_Hydralisk));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Ultralisk", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Ultralisk));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Ultralisk", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Ultralisk));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Ultralisk.getID(), &UnitTypes::Zerg_Ultralisk));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Broodling", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Broodling));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Broodling", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Broodling));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Broodling.getID(), &UnitTypes::Zerg_Broodling));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Drone", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Drone));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Drone", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Drone));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Drone.getID(), &UnitTypes::Zerg_Drone));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Overlord", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Overlord));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Overlord", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Overlord));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Overlord.getID(), &UnitTypes::Zerg_Overlord));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Mutalisk", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Mutalisk));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Mutalisk", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Mutalisk));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Mutalisk.getID(), &UnitTypes::Zerg_Mutalisk));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Guardian", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Guardian));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Guardian", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Guardian));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Guardian.getID(), &UnitTypes::Zerg_Guardian));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Queen", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Queen));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Queen", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Queen));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Queen.getID(), &UnitTypes::Zerg_Queen));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Defiler", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Defiler));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Defiler", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Defiler));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Defiler.getID(), &UnitTypes::Zerg_Defiler));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Scourge", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Scourge));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Scourge", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Scourge));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Scourge.getID(), &UnitTypes::Zerg_Scourge));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Torrasque", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Torrasque));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Torrasque", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Torrasque));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Torrasque.getID(), &UnitTypes::Hero_Torrasque));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Matriarch", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Matriarch));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Matriarch", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Matriarch));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Matriarch.getID(), &UnitTypes::Hero_Matriarch));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Infested_Terran", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Infested_Terran));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Infested_Terran", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Infested_Terran));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Infested_Terran.getID(), &UnitTypes::Zerg_Infested_Terran));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Infested_Kerrigan", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Infested_Kerrigan));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Infested_Kerrigan", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Infested_Kerrigan));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Infested_Kerrigan.getID(), &UnitTypes::Hero_Infested_Kerrigan));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Unclean_One", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Unclean_One));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Unclean_One", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Unclean_One));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Unclean_One.getID(), &UnitTypes::Hero_Unclean_One));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Hunter_Killer", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Hunter_Killer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Hunter_Killer", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Hunter_Killer));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Hunter_Killer.getID(), &UnitTypes::Hero_Hunter_Killer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Devouring_One", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Devouring_One));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Devouring_One", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Devouring_One));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Devouring_One.getID(), &UnitTypes::Hero_Devouring_One));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Kukulza_Mutalisk", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Kukulza_Mutalisk));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Kukulza_Mutalisk", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Kukulza_Mutalisk));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Kukulza_Mutalisk.getID(), &UnitTypes::Hero_Kukulza_Mutalisk));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Kukulza_Guardian", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Kukulza_Guardian));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Kukulza_Guardian", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Kukulza_Guardian));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Kukulza_Guardian.getID(), &UnitTypes::Hero_Kukulza_Guardian));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Yggdrasill", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Yggdrasill));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Yggdrasill", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Yggdrasill));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Yggdrasill.getID(), &UnitTypes::Hero_Yggdrasill));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Valkyrie", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Valkyrie));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Valkyrie", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Valkyrie));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Valkyrie.getID(), &UnitTypes::Terran_Valkyrie));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Cocoon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Cocoon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Cocoon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Cocoon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Cocoon.getID(), &UnitTypes::Zerg_Cocoon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Corsair", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Corsair));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Corsair", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Corsair));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Corsair.getID(), &UnitTypes::Protoss_Corsair));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Dark_Templar", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Dark_Templar));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Dark_Templar", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Dark_Templar));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Dark_Templar.getID(), &UnitTypes::Protoss_Dark_Templar));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Devourer", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Devourer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Devourer", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Devourer));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Devourer.getID(), &UnitTypes::Zerg_Devourer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Dark_Archon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Dark_Archon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Dark_Archon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Dark_Archon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Dark_Archon.getID(), &UnitTypes::Protoss_Dark_Archon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Probe", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Probe));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Probe", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Probe));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Probe.getID(), &UnitTypes::Protoss_Probe));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Zealot", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Zealot));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Zealot", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Zealot));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Zealot.getID(), &UnitTypes::Protoss_Zealot));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Dragoon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Dragoon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Dragoon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Dragoon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Dragoon.getID(), &UnitTypes::Protoss_Dragoon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_High_Templar", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_High_Templar));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_High_Templar", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_High_Templar));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_High_Templar.getID(), &UnitTypes::Protoss_High_Templar));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Archon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Archon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Archon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Archon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Archon.getID(), &UnitTypes::Protoss_Archon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Shuttle", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Shuttle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Shuttle", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Shuttle));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Shuttle.getID(), &UnitTypes::Protoss_Shuttle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Scout", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Scout));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Scout", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Scout));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Scout.getID(), &UnitTypes::Protoss_Scout));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Arbiter", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Arbiter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Arbiter", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Arbiter));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Arbiter.getID(), &UnitTypes::Protoss_Arbiter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Carrier", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Carrier));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Carrier", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Carrier));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Carrier.getID(), &UnitTypes::Protoss_Carrier));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Interceptor", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Interceptor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Interceptor", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Interceptor));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Interceptor.getID(), &UnitTypes::Protoss_Interceptor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Dark_Templar", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Dark_Templar));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Dark_Templar", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Dark_Templar));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Dark_Templar.getID(), &UnitTypes::Hero_Dark_Templar));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Zeratul", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Zeratul));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Zeratul", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Zeratul));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Zeratul.getID(), &UnitTypes::Hero_Zeratul));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Tassadar_Zeratul_Archon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Tassadar_Zeratul_Archon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Tassadar_Zeratul_Archon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Tassadar_Zeratul_Archon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Tassadar_Zeratul_Archon.getID(), &UnitTypes::Hero_Tassadar_Zeratul_Archon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Fenix_Zealot", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Fenix_Zealot));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Fenix_Zealot", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Fenix_Zealot));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Fenix_Zealot.getID(), &UnitTypes::Hero_Fenix_Zealot));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Fenix_Dragoon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Fenix_Dragoon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Fenix_Dragoon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Fenix_Dragoon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Fenix_Dragoon.getID(), &UnitTypes::Hero_Fenix_Dragoon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Tassadar", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Tassadar));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Tassadar", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Tassadar));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Tassadar.getID(), &UnitTypes::Hero_Tassadar));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Mojo", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Mojo));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Mojo", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Mojo));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Mojo.getID(), &UnitTypes::Hero_Mojo));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Warbringer", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Warbringer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Warbringer", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Warbringer));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Warbringer.getID(), &UnitTypes::Hero_Warbringer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Gantrithor", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Gantrithor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Gantrithor", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Gantrithor));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Gantrithor.getID(), &UnitTypes::Hero_Gantrithor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Reaver", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Reaver));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Reaver", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Reaver));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Reaver.getID(), &UnitTypes::Protoss_Reaver));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Observer", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Observer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Observer", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Observer));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Observer.getID(), &UnitTypes::Protoss_Observer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Scarab", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Scarab));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Scarab", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Scarab));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Scarab.getID(), &UnitTypes::Protoss_Scarab));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Danimoth", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Danimoth));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Danimoth", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Danimoth));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Danimoth.getID(), &UnitTypes::Hero_Danimoth));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Aldaris", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Aldaris));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Aldaris", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Aldaris));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Aldaris.getID(), &UnitTypes::Hero_Aldaris));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Artanis", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Artanis));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Artanis", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Artanis));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Artanis.getID(), &UnitTypes::Hero_Artanis));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Rhynadon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Rhynadon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Rhynadon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Rhynadon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Critter_Rhynadon.getID(), &UnitTypes::Critter_Rhynadon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Bengalaas", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Bengalaas));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Bengalaas", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Bengalaas));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Critter_Bengalaas.getID(), &UnitTypes::Critter_Bengalaas));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Cargo_Ship", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Cargo_Ship));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Cargo_Ship", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Cargo_Ship));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Cargo_Ship.getID(), &UnitTypes::Special_Cargo_Ship));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Mercenary_Gunship", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Mercenary_Gunship));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Mercenary_Gunship", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Mercenary_Gunship));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Mercenary_Gunship.getID(), &UnitTypes::Special_Mercenary_Gunship));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Scantid", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Scantid));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Scantid", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Scantid));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Critter_Scantid.getID(), &UnitTypes::Critter_Scantid));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Kakaru", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Kakaru));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Kakaru", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Kakaru));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Critter_Kakaru.getID(), &UnitTypes::Critter_Kakaru));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Ragnasaur", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Ragnasaur));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Ragnasaur", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Ragnasaur));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Critter_Ragnasaur.getID(), &UnitTypes::Critter_Ragnasaur));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Ursadon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Ursadon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Critter_Ursadon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Critter_Ursadon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Critter_Ursadon.getID(), &UnitTypes::Critter_Ursadon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Lurker_Egg", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Lurker_Egg));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Lurker_Egg", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Lurker_Egg));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Lurker_Egg.getID(), &UnitTypes::Zerg_Lurker_Egg));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Raszagal", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Raszagal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Raszagal", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Raszagal));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Raszagal.getID(), &UnitTypes::Hero_Raszagal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Samir_Duran", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Samir_Duran));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Samir_Duran", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Samir_Duran));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Samir_Duran.getID(), &UnitTypes::Hero_Samir_Duran));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Alexei_Stukov", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Alexei_Stukov));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Alexei_Stukov", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Alexei_Stukov));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Alexei_Stukov.getID(), &UnitTypes::Hero_Alexei_Stukov));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Map_Revealer", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Map_Revealer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Map_Revealer", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Map_Revealer));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Map_Revealer.getID(), &UnitTypes::Special_Map_Revealer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Gerard_DuGalle", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Gerard_DuGalle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Gerard_DuGalle", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Gerard_DuGalle));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Gerard_DuGalle.getID(), &UnitTypes::Hero_Gerard_DuGalle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Lurker", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Lurker));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Lurker", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Lurker));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Lurker.getID(), &UnitTypes::Zerg_Lurker));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Infested_Duran", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Infested_Duran));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hero_Infested_Duran", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Hero_Infested_Duran));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Hero_Infested_Duran.getID(), &UnitTypes::Hero_Infested_Duran));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spell_Disruption_Web", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Spell_Disruption_Web));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spell_Disruption_Web", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Spell_Disruption_Web));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Spell_Disruption_Web.getID(), &UnitTypes::Spell_Disruption_Web));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Command_Center", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Command_Center));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Command_Center", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Command_Center));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Command_Center.getID(), &UnitTypes::Terran_Command_Center));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Comsat_Station", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Comsat_Station));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Comsat_Station", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Comsat_Station));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Comsat_Station.getID(), &UnitTypes::Terran_Comsat_Station));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Nuclear_Silo", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Nuclear_Silo));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Nuclear_Silo", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Nuclear_Silo));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Nuclear_Silo.getID(), &UnitTypes::Terran_Nuclear_Silo));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Supply_Depot", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Supply_Depot));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Supply_Depot", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Supply_Depot));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Supply_Depot.getID(), &UnitTypes::Terran_Supply_Depot));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Refinery", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Refinery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Refinery", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Refinery));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Refinery.getID(), &UnitTypes::Terran_Refinery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Barracks", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Barracks));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Barracks", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Barracks));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Barracks.getID(), &UnitTypes::Terran_Barracks));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Academy", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Academy));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Academy", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Academy));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Academy.getID(), &UnitTypes::Terran_Academy));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Factory", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Factory));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Factory", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Factory));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Factory.getID(), &UnitTypes::Terran_Factory));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Starport", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Starport));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Starport", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Starport));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Starport.getID(), &UnitTypes::Terran_Starport));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Control_Tower", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Control_Tower));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Control_Tower", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Control_Tower));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Control_Tower.getID(), &UnitTypes::Terran_Control_Tower));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Science_Facility", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Science_Facility));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Science_Facility", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Science_Facility));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Science_Facility.getID(), &UnitTypes::Terran_Science_Facility));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Covert_Ops", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Covert_Ops));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Covert_Ops", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Covert_Ops));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Covert_Ops.getID(), &UnitTypes::Terran_Covert_Ops));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Physics_Lab", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Physics_Lab));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Physics_Lab", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Physics_Lab));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Physics_Lab.getID(), &UnitTypes::Terran_Physics_Lab));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Machine_Shop", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Machine_Shop));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Machine_Shop", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Machine_Shop));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Machine_Shop.getID(), &UnitTypes::Terran_Machine_Shop));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Engineering_Bay", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Engineering_Bay));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Engineering_Bay", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Engineering_Bay));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Engineering_Bay.getID(), &UnitTypes::Terran_Engineering_Bay));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Armory", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Armory));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Armory", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Armory));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Armory.getID(), &UnitTypes::Terran_Armory));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Missile_Turret", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Missile_Turret));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Missile_Turret", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Missile_Turret));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Missile_Turret.getID(), &UnitTypes::Terran_Missile_Turret));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Bunker", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Bunker));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Bunker", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Terran_Bunker));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Terran_Bunker.getID(), &UnitTypes::Terran_Bunker));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Crashed_Norad_II", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Crashed_Norad_II));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Crashed_Norad_II", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Crashed_Norad_II));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Crashed_Norad_II.getID(), &UnitTypes::Special_Crashed_Norad_II));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Ion_Cannon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Ion_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Ion_Cannon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Ion_Cannon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Ion_Cannon.getID(), &UnitTypes::Special_Ion_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Uraj_Crystal", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Uraj_Crystal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Uraj_Crystal", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Uraj_Crystal));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Uraj_Crystal.getID(), &UnitTypes::Powerup_Uraj_Crystal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Khalis_Crystal", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Khalis_Crystal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Khalis_Crystal", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Khalis_Crystal));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Khalis_Crystal.getID(), &UnitTypes::Powerup_Khalis_Crystal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Infested_Command_Center", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Infested_Command_Center));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Infested_Command_Center", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Infested_Command_Center));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Infested_Command_Center.getID(), &UnitTypes::Zerg_Infested_Command_Center));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hatchery", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hatchery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hatchery", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hatchery));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Hatchery.getID(), &UnitTypes::Zerg_Hatchery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Lair", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Lair));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Lair", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Lair));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Lair.getID(), &UnitTypes::Zerg_Lair));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hive", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hive));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hive", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hive));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Hive.getID(), &UnitTypes::Zerg_Hive));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Nydus_Canal", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Nydus_Canal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Nydus_Canal", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Nydus_Canal));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Nydus_Canal.getID(), &UnitTypes::Zerg_Nydus_Canal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hydralisk_Den", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hydralisk_Den));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Hydralisk_Den", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Hydralisk_Den));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Hydralisk_Den.getID(), &UnitTypes::Zerg_Hydralisk_Den));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Defiler_Mound", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Defiler_Mound));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Defiler_Mound", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Defiler_Mound));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Defiler_Mound.getID(), &UnitTypes::Zerg_Defiler_Mound));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Greater_Spire", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Greater_Spire));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Greater_Spire", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Greater_Spire));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Greater_Spire.getID(), &UnitTypes::Zerg_Greater_Spire));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Queens_Nest", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Queens_Nest));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Queens_Nest", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Queens_Nest));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Queens_Nest.getID(), &UnitTypes::Zerg_Queens_Nest));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Evolution_Chamber", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Evolution_Chamber));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Evolution_Chamber", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Evolution_Chamber));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Evolution_Chamber.getID(), &UnitTypes::Zerg_Evolution_Chamber));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Ultralisk_Cavern", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Ultralisk_Cavern));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Ultralisk_Cavern", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Ultralisk_Cavern));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Ultralisk_Cavern.getID(), &UnitTypes::Zerg_Ultralisk_Cavern));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Spire", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Spire));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Spire", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Spire));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Spire.getID(), &UnitTypes::Zerg_Spire));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Spawning_Pool", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Spawning_Pool));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Spawning_Pool", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Spawning_Pool));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Spawning_Pool.getID(), &UnitTypes::Zerg_Spawning_Pool));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Creep_Colony", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Creep_Colony));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Creep_Colony", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Creep_Colony));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Creep_Colony.getID(), &UnitTypes::Zerg_Creep_Colony));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Spore_Colony", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Spore_Colony));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Spore_Colony", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Spore_Colony));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Spore_Colony.getID(), &UnitTypes::Zerg_Spore_Colony));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Sunken_Colony", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Sunken_Colony));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Sunken_Colony", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Sunken_Colony));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Sunken_Colony.getID(), &UnitTypes::Zerg_Sunken_Colony));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Overmind_With_Shell", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Overmind_With_Shell));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Overmind_With_Shell", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Overmind_With_Shell));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Overmind_With_Shell.getID(), &UnitTypes::Special_Overmind_With_Shell));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Overmind", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Overmind));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Overmind", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Overmind));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Overmind.getID(), &UnitTypes::Special_Overmind));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Extractor", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Extractor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Extractor", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Zerg_Extractor));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Zerg_Extractor.getID(), &UnitTypes::Zerg_Extractor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Mature_Chrysalis", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Mature_Chrysalis));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Mature_Chrysalis", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Mature_Chrysalis));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Mature_Chrysalis.getID(), &UnitTypes::Special_Mature_Chrysalis));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Cerebrate", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Cerebrate));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Cerebrate", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Cerebrate));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Cerebrate.getID(), &UnitTypes::Special_Cerebrate));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Cerebrate_Daggoth", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Cerebrate_Daggoth));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Cerebrate_Daggoth", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Cerebrate_Daggoth));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Cerebrate_Daggoth.getID(), &UnitTypes::Special_Cerebrate_Daggoth));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Nexus", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Nexus));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Nexus", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Nexus));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Nexus.getID(), &UnitTypes::Protoss_Nexus));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Robotics_Facility", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Robotics_Facility));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Robotics_Facility", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Robotics_Facility));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Robotics_Facility.getID(), &UnitTypes::Protoss_Robotics_Facility));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Pylon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Pylon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Pylon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Pylon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Pylon.getID(), &UnitTypes::Protoss_Pylon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Assimilator", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Assimilator));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Assimilator", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Assimilator));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Assimilator.getID(), &UnitTypes::Protoss_Assimilator));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Observatory", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Observatory));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Observatory", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Observatory));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Observatory.getID(), &UnitTypes::Protoss_Observatory));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Gateway", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Gateway));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Gateway", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Gateway));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Gateway.getID(), &UnitTypes::Protoss_Gateway));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Photon_Cannon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Photon_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Photon_Cannon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Photon_Cannon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Photon_Cannon.getID(), &UnitTypes::Protoss_Photon_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Citadel_of_Adun", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Citadel_of_Adun));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Citadel_of_Adun", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Citadel_of_Adun));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Citadel_of_Adun.getID(), &UnitTypes::Protoss_Citadel_of_Adun));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Cybernetics_Core", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Cybernetics_Core));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Cybernetics_Core", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Cybernetics_Core));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Cybernetics_Core.getID(), &UnitTypes::Protoss_Cybernetics_Core));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Templar_Archives", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Templar_Archives));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Templar_Archives", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Templar_Archives));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Templar_Archives.getID(), &UnitTypes::Protoss_Templar_Archives));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Forge", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Forge));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Forge", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Forge));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Forge.getID(), &UnitTypes::Protoss_Forge));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Stargate", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Stargate));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Stargate", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Stargate));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Stargate.getID(), &UnitTypes::Protoss_Stargate));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Stasis_Cell_Prison", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Stasis_Cell_Prison));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Stasis_Cell_Prison", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Stasis_Cell_Prison));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Stasis_Cell_Prison.getID(), &UnitTypes::Special_Stasis_Cell_Prison));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Fleet_Beacon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Fleet_Beacon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Fleet_Beacon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Fleet_Beacon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Fleet_Beacon.getID(), &UnitTypes::Protoss_Fleet_Beacon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Arbiter_Tribunal", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Arbiter_Tribunal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Arbiter_Tribunal", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Arbiter_Tribunal));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Arbiter_Tribunal.getID(), &UnitTypes::Protoss_Arbiter_Tribunal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Robotics_Support_Bay", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Robotics_Support_Bay));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Robotics_Support_Bay", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Robotics_Support_Bay));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Robotics_Support_Bay.getID(), &UnitTypes::Protoss_Robotics_Support_Bay));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Shield_Battery", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Shield_Battery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Shield_Battery", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Protoss_Shield_Battery));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Protoss_Shield_Battery.getID(), &UnitTypes::Protoss_Shield_Battery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Khaydarin_Crystal_Form", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Khaydarin_Crystal_Form));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Khaydarin_Crystal_Form", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Khaydarin_Crystal_Form));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Khaydarin_Crystal_Form.getID(), &UnitTypes::Special_Khaydarin_Crystal_Form));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Protoss_Temple", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Protoss_Temple));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Protoss_Temple", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Protoss_Temple));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Protoss_Temple.getID(), &UnitTypes::Special_Protoss_Temple));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_XelNaga_Temple", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_XelNaga_Temple));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_XelNaga_Temple", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_XelNaga_Temple));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_XelNaga_Temple.getID(), &UnitTypes::Special_XelNaga_Temple));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Mineral_Field", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Mineral_Field));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Mineral_Field", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Mineral_Field));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Resource_Mineral_Field.getID(), &UnitTypes::Resource_Mineral_Field));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Mineral_Field_Type_2", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Mineral_Field_Type_2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Mineral_Field_Type_2", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Mineral_Field_Type_2));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Resource_Mineral_Field_Type_2.getID(), &UnitTypes::Resource_Mineral_Field_Type_2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Mineral_Field_Type_3", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Mineral_Field_Type_3));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Mineral_Field_Type_3", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Mineral_Field_Type_3));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Resource_Mineral_Field_Type_3.getID(), &UnitTypes::Resource_Mineral_Field_Type_3));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Independant_Starport", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Independant_Starport));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Independant_Starport", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Independant_Starport));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Independant_Starport.getID(), &UnitTypes::Special_Independant_Starport));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Vespene_Geyser", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Vespene_Geyser));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Resource_Vespene_Geyser", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Resource_Vespene_Geyser));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Resource_Vespene_Geyser.getID(), &UnitTypes::Resource_Vespene_Geyser));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Warp_Gate", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Warp_Gate));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Warp_Gate", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Warp_Gate));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Warp_Gate.getID(), &UnitTypes::Special_Warp_Gate));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Psi_Disrupter", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Psi_Disrupter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Psi_Disrupter", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Psi_Disrupter));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Psi_Disrupter.getID(), &UnitTypes::Special_Psi_Disrupter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Zerg_Beacon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Zerg_Beacon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Zerg_Beacon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Zerg_Beacon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Zerg_Beacon.getID(), &UnitTypes::Special_Zerg_Beacon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Terran_Beacon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Terran_Beacon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Terran_Beacon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Terran_Beacon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Terran_Beacon.getID(), &UnitTypes::Special_Terran_Beacon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Protoss_Beacon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Protoss_Beacon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Protoss_Beacon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Protoss_Beacon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Protoss_Beacon.getID(), &UnitTypes::Special_Protoss_Beacon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Zerg_Flag_Beacon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Zerg_Flag_Beacon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Zerg_Flag_Beacon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Zerg_Flag_Beacon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Zerg_Flag_Beacon.getID(), &UnitTypes::Special_Zerg_Flag_Beacon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Terran_Flag_Beacon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Terran_Flag_Beacon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Terran_Flag_Beacon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Terran_Flag_Beacon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Terran_Flag_Beacon.getID(), &UnitTypes::Special_Terran_Flag_Beacon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Protoss_Flag_Beacon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Protoss_Flag_Beacon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Protoss_Flag_Beacon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Protoss_Flag_Beacon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Protoss_Flag_Beacon.getID(), &UnitTypes::Special_Protoss_Flag_Beacon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Power_Generator", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Power_Generator));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Power_Generator", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Power_Generator));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Power_Generator.getID(), &UnitTypes::Special_Power_Generator));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Overmind_Cocoon", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Overmind_Cocoon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Overmind_Cocoon", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Overmind_Cocoon));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Overmind_Cocoon.getID(), &UnitTypes::Special_Overmind_Cocoon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spell_Dark_Swarm", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Spell_Dark_Swarm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spell_Dark_Swarm", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Spell_Dark_Swarm));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Spell_Dark_Swarm.getID(), &UnitTypes::Spell_Dark_Swarm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Floor_Missile_Trap", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Floor_Missile_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Floor_Missile_Trap", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Floor_Missile_Trap));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Floor_Missile_Trap.getID(), &UnitTypes::Special_Floor_Missile_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Floor_Hatch", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Floor_Hatch));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Floor_Hatch", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Floor_Hatch));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Floor_Hatch.getID(), &UnitTypes::Special_Floor_Hatch));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Upper_Level_Door", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Upper_Level_Door));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Upper_Level_Door", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Upper_Level_Door));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Upper_Level_Door.getID(), &UnitTypes::Special_Upper_Level_Door));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Upper_Level_Door", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Upper_Level_Door));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Upper_Level_Door", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Upper_Level_Door));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Right_Upper_Level_Door.getID(), &UnitTypes::Special_Right_Upper_Level_Door));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Pit_Door", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Pit_Door));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Pit_Door", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Pit_Door));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Pit_Door.getID(), &UnitTypes::Special_Pit_Door));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Pit_Door", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Pit_Door));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Pit_Door", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Pit_Door));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Right_Pit_Door.getID(), &UnitTypes::Special_Right_Pit_Door));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Floor_Gun_Trap", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Floor_Gun_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Floor_Gun_Trap", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Floor_Gun_Trap));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Floor_Gun_Trap.getID(), &UnitTypes::Special_Floor_Gun_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Wall_Missile_Trap", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Wall_Missile_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Wall_Missile_Trap", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Wall_Missile_Trap));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Wall_Missile_Trap.getID(), &UnitTypes::Special_Wall_Missile_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Wall_Flame_Trap", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Wall_Flame_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Wall_Flame_Trap", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Wall_Flame_Trap));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Wall_Flame_Trap.getID(), &UnitTypes::Special_Wall_Flame_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Wall_Missile_Trap", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Wall_Missile_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Wall_Missile_Trap", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Wall_Missile_Trap));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Right_Wall_Missile_Trap.getID(), &UnitTypes::Special_Right_Wall_Missile_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Wall_Flame_Trap", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Wall_Flame_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Right_Wall_Flame_Trap", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Right_Wall_Flame_Trap));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Right_Wall_Flame_Trap.getID(), &UnitTypes::Special_Right_Wall_Flame_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Start_Location", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Start_Location));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Special_Start_Location", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Special_Start_Location));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Special_Start_Location.getID(), &UnitTypes::Special_Start_Location));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Flag", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Flag));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Flag", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Flag));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Flag.getID(), &UnitTypes::Powerup_Flag));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Young_Chrysalis", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Young_Chrysalis));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Young_Chrysalis", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Young_Chrysalis));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Young_Chrysalis.getID(), &UnitTypes::Powerup_Young_Chrysalis));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Psi_Emitter", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Psi_Emitter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Psi_Emitter", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Psi_Emitter));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Psi_Emitter.getID(), &UnitTypes::Powerup_Psi_Emitter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Data_Disk", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Data_Disk));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Data_Disk", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Data_Disk));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Data_Disk.getID(), &UnitTypes::Powerup_Data_Disk));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Khaydarin_Crystal", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Khaydarin_Crystal));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Khaydarin_Crystal", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Khaydarin_Crystal));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Khaydarin_Crystal.getID(), &UnitTypes::Powerup_Khaydarin_Crystal));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Mineral_Cluster_Type_1", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Mineral_Cluster_Type_1));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Mineral_Cluster_Type_1", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Mineral_Cluster_Type_1));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Mineral_Cluster_Type_1.getID(), &UnitTypes::Powerup_Mineral_Cluster_Type_1));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Mineral_Cluster_Type_2", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Mineral_Cluster_Type_2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Mineral_Cluster_Type_2", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Mineral_Cluster_Type_2));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Mineral_Cluster_Type_2.getID(), &UnitTypes::Powerup_Mineral_Cluster_Type_2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Protoss_Gas_Orb_Type_1", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Protoss_Gas_Orb_Type_1));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Protoss_Gas_Orb_Type_1", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Protoss_Gas_Orb_Type_1));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Protoss_Gas_Orb_Type_1.getID(), &UnitTypes::Powerup_Protoss_Gas_Orb_Type_1));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Protoss_Gas_Orb_Type_2", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Protoss_Gas_Orb_Type_2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Protoss_Gas_Orb_Type_2", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Protoss_Gas_Orb_Type_2));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Protoss_Gas_Orb_Type_2.getID(), &UnitTypes::Powerup_Protoss_Gas_Orb_Type_2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Zerg_Gas_Sac_Type_1", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Zerg_Gas_Sac_Type_1));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Zerg_Gas_Sac_Type_1", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Zerg_Gas_Sac_Type_1));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Zerg_Gas_Sac_Type_1.getID(), &UnitTypes::Powerup_Zerg_Gas_Sac_Type_1));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Zerg_Gas_Sac_Type_2", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Zerg_Gas_Sac_Type_2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Zerg_Gas_Sac_Type_2", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Zerg_Gas_Sac_Type_2));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Zerg_Gas_Sac_Type_2.getID(), &UnitTypes::Powerup_Zerg_Gas_Sac_Type_2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Terran_Gas_Tank_Type_1", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Terran_Gas_Tank_Type_1));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Terran_Gas_Tank_Type_1", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Terran_Gas_Tank_Type_1));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Terran_Gas_Tank_Type_1.getID(), &UnitTypes::Powerup_Terran_Gas_Tank_Type_1));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Terran_Gas_Tank_Type_2", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Terran_Gas_Tank_Type_2));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Powerup_Terran_Gas_Tank_Type_2", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Powerup_Terran_Gas_Tank_Type_2));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Powerup_Terran_Gas_Tank_Type_2.getID(), &UnitTypes::Powerup_Terran_Gas_Tank_Type_2));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::None));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::None.getID(), &UnitTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AllUnits", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::AllUnits));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "AllUnits", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::AllUnits));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::AllUnits.getID(), &UnitTypes::AllUnits));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Men", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Men));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Men", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Men));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Men.getID(), &UnitTypes::Men));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Buildings", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Buildings));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Buildings", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Buildings));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Buildings.getID(), &UnitTypes::Buildings));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Factories", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Factories));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Factories", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Factories));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Factories.getID(), &UnitTypes::Factories));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/UnitType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UnitTypes::Unknown));
 tableUnitType.insert(std::pair<int, const UnitType*>(UnitTypes::Unknown.getID(), &UnitTypes::Unknown));
-cls = env->FindClass("Lbwapi4/UpgradeType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/UpgradeType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Infantry_Armor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Infantry_Armor));
+cls = env->FindClass("Lbwapi/UpgradeType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/UpgradeType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Infantry_Armor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Infantry_Armor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Terran_Infantry_Armor.getID(), &UpgradeTypes::Terran_Infantry_Armor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vehicle_Plating", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Vehicle_Plating));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vehicle_Plating", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Vehicle_Plating));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Terran_Vehicle_Plating.getID(), &UpgradeTypes::Terran_Vehicle_Plating));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Ship_Plating", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Ship_Plating));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Ship_Plating", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Ship_Plating));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Terran_Ship_Plating.getID(), &UpgradeTypes::Terran_Ship_Plating));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Carapace", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Carapace));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Carapace", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Carapace));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Zerg_Carapace.getID(), &UpgradeTypes::Zerg_Carapace));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Flyer_Carapace", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Flyer_Carapace));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Flyer_Carapace", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Flyer_Carapace));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Zerg_Flyer_Carapace.getID(), &UpgradeTypes::Zerg_Flyer_Carapace));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Ground_Armor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Ground_Armor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Ground_Armor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Ground_Armor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Protoss_Ground_Armor.getID(), &UpgradeTypes::Protoss_Ground_Armor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Air_Armor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Air_Armor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Air_Armor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Air_Armor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Protoss_Air_Armor.getID(), &UpgradeTypes::Protoss_Air_Armor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Infantry_Weapons", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Infantry_Weapons));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Infantry_Weapons", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Infantry_Weapons));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Terran_Infantry_Weapons.getID(), &UpgradeTypes::Terran_Infantry_Weapons));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vehicle_Weapons", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Vehicle_Weapons));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Vehicle_Weapons", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Vehicle_Weapons));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Terran_Vehicle_Weapons.getID(), &UpgradeTypes::Terran_Vehicle_Weapons));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Ship_Weapons", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Ship_Weapons));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Terran_Ship_Weapons", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Terran_Ship_Weapons));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Terran_Ship_Weapons.getID(), &UpgradeTypes::Terran_Ship_Weapons));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Melee_Attacks", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Melee_Attacks));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Melee_Attacks", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Melee_Attacks));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Zerg_Melee_Attacks.getID(), &UpgradeTypes::Zerg_Melee_Attacks));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Missile_Attacks", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Missile_Attacks));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Missile_Attacks", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Missile_Attacks));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Zerg_Missile_Attacks.getID(), &UpgradeTypes::Zerg_Missile_Attacks));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Flyer_Attacks", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Flyer_Attacks));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Zerg_Flyer_Attacks", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Zerg_Flyer_Attacks));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Zerg_Flyer_Attacks.getID(), &UpgradeTypes::Zerg_Flyer_Attacks));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Ground_Weapons", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Ground_Weapons));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Ground_Weapons", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Ground_Weapons));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Protoss_Ground_Weapons.getID(), &UpgradeTypes::Protoss_Ground_Weapons));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Air_Weapons", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Air_Weapons));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Air_Weapons", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Air_Weapons));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Protoss_Air_Weapons.getID(), &UpgradeTypes::Protoss_Air_Weapons));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Plasma_Shields", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Plasma_Shields));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Protoss_Plasma_Shields", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Protoss_Plasma_Shields));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Protoss_Plasma_Shields.getID(), &UpgradeTypes::Protoss_Plasma_Shields));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "U_238_Shells", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::U_238_Shells));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "U_238_Shells", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::U_238_Shells));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::U_238_Shells.getID(), &UpgradeTypes::U_238_Shells));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ion_Thrusters", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Ion_Thrusters));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ion_Thrusters", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Ion_Thrusters));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Ion_Thrusters.getID(), &UpgradeTypes::Ion_Thrusters));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Titan_Reactor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Titan_Reactor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Titan_Reactor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Titan_Reactor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Titan_Reactor.getID(), &UpgradeTypes::Titan_Reactor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ocular_Implants", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Ocular_Implants));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ocular_Implants", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Ocular_Implants));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Ocular_Implants.getID(), &UpgradeTypes::Ocular_Implants));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Moebius_Reactor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Moebius_Reactor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Moebius_Reactor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Moebius_Reactor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Moebius_Reactor.getID(), &UpgradeTypes::Moebius_Reactor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Apollo_Reactor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Apollo_Reactor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Apollo_Reactor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Apollo_Reactor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Apollo_Reactor.getID(), &UpgradeTypes::Apollo_Reactor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Colossus_Reactor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Colossus_Reactor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Colossus_Reactor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Colossus_Reactor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Colossus_Reactor.getID(), &UpgradeTypes::Colossus_Reactor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ventral_Sacs", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Ventral_Sacs));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ventral_Sacs", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Ventral_Sacs));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Ventral_Sacs.getID(), &UpgradeTypes::Ventral_Sacs));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Antennae", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Antennae));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Antennae", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Antennae));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Antennae.getID(), &UpgradeTypes::Antennae));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pneumatized_Carapace", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Pneumatized_Carapace));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pneumatized_Carapace", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Pneumatized_Carapace));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Pneumatized_Carapace.getID(), &UpgradeTypes::Pneumatized_Carapace));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Metabolic_Boost", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Metabolic_Boost));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Metabolic_Boost", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Metabolic_Boost));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Metabolic_Boost.getID(), &UpgradeTypes::Metabolic_Boost));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Adrenal_Glands", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Adrenal_Glands));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Adrenal_Glands", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Adrenal_Glands));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Adrenal_Glands.getID(), &UpgradeTypes::Adrenal_Glands));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Muscular_Augments", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Muscular_Augments));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Muscular_Augments", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Muscular_Augments));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Muscular_Augments.getID(), &UpgradeTypes::Muscular_Augments));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Grooved_Spines", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Grooved_Spines));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Grooved_Spines", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Grooved_Spines));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Grooved_Spines.getID(), &UpgradeTypes::Grooved_Spines));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gamete_Meiosis", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gamete_Meiosis));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gamete_Meiosis", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gamete_Meiosis));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Gamete_Meiosis.getID(), &UpgradeTypes::Gamete_Meiosis));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Metasynaptic_Node", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Metasynaptic_Node));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Metasynaptic_Node", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Metasynaptic_Node));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Metasynaptic_Node.getID(), &UpgradeTypes::Metasynaptic_Node));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Singularity_Charge", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Singularity_Charge));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Singularity_Charge", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Singularity_Charge));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Singularity_Charge.getID(), &UpgradeTypes::Singularity_Charge));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Leg_Enhancements", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Leg_Enhancements));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Leg_Enhancements", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Leg_Enhancements));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Leg_Enhancements.getID(), &UpgradeTypes::Leg_Enhancements));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scarab_Damage", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Scarab_Damage));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scarab_Damage", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Scarab_Damage));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Scarab_Damage.getID(), &UpgradeTypes::Scarab_Damage));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Reaver_Capacity", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Reaver_Capacity));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Reaver_Capacity", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Reaver_Capacity));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Reaver_Capacity.getID(), &UpgradeTypes::Reaver_Capacity));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gravitic_Drive", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gravitic_Drive));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gravitic_Drive", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gravitic_Drive));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Gravitic_Drive.getID(), &UpgradeTypes::Gravitic_Drive));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sensor_Array", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Sensor_Array));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Sensor_Array", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Sensor_Array));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Sensor_Array.getID(), &UpgradeTypes::Sensor_Array));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gravitic_Boosters", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gravitic_Boosters));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gravitic_Boosters", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gravitic_Boosters));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Gravitic_Boosters.getID(), &UpgradeTypes::Gravitic_Boosters));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Khaydarin_Amulet", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Khaydarin_Amulet));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Khaydarin_Amulet", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Khaydarin_Amulet));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Khaydarin_Amulet.getID(), &UpgradeTypes::Khaydarin_Amulet));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Apial_Sensors", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Apial_Sensors));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Apial_Sensors", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Apial_Sensors));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Apial_Sensors.getID(), &UpgradeTypes::Apial_Sensors));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gravitic_Thrusters", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gravitic_Thrusters));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gravitic_Thrusters", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Gravitic_Thrusters));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Gravitic_Thrusters.getID(), &UpgradeTypes::Gravitic_Thrusters));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Carrier_Capacity", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Carrier_Capacity));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Carrier_Capacity", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Carrier_Capacity));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Carrier_Capacity.getID(), &UpgradeTypes::Carrier_Capacity));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Khaydarin_Core", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Khaydarin_Core));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Khaydarin_Core", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Khaydarin_Core));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Khaydarin_Core.getID(), &UpgradeTypes::Khaydarin_Core));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Argus_Jewel", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Argus_Jewel));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Argus_Jewel", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Argus_Jewel));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Argus_Jewel.getID(), &UpgradeTypes::Argus_Jewel));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Argus_Talisman", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Argus_Talisman));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Argus_Talisman", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Argus_Talisman));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Argus_Talisman.getID(), &UpgradeTypes::Argus_Talisman));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Caduceus_Reactor", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Caduceus_Reactor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Caduceus_Reactor", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Caduceus_Reactor));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Caduceus_Reactor.getID(), &UpgradeTypes::Caduceus_Reactor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Chitinous_Plating", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Chitinous_Plating));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Chitinous_Plating", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Chitinous_Plating));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Chitinous_Plating.getID(), &UpgradeTypes::Chitinous_Plating));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anabolic_Synthesis", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Anabolic_Synthesis));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anabolic_Synthesis", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Anabolic_Synthesis));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Anabolic_Synthesis.getID(), &UpgradeTypes::Anabolic_Synthesis));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Charon_Boosters", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Charon_Boosters));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Charon_Boosters", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Charon_Boosters));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Charon_Boosters.getID(), &UpgradeTypes::Charon_Boosters));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Upgrade_60", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Upgrade_60));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Upgrade_60", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Upgrade_60));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Upgrade_60.getID(), &UpgradeTypes::Upgrade_60));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::None));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::None.getID(), &UpgradeTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/UpgradeType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&UpgradeTypes::Unknown));
 tableUpgradeType.insert(std::pair<int, const UpgradeType*>(UpgradeTypes::Unknown.getID(), &UpgradeTypes::Unknown));
-cls = env->FindClass("Lbwapi4/WeaponType;");
-getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi4/WeaponType;");
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gauss_Rifle", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gauss_Rifle));
+cls = env->FindClass("Lbwapi/WeaponType;");
+getId = env->GetStaticMethodID(cls, "get", "(J)Lbwapi/WeaponType;");
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gauss_Rifle", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gauss_Rifle));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Gauss_Rifle.getID(), &WeaponTypes::Gauss_Rifle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gauss_Rifle_Jim_Raynor", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gauss_Rifle_Jim_Raynor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gauss_Rifle_Jim_Raynor", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gauss_Rifle_Jim_Raynor));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Gauss_Rifle_Jim_Raynor.getID(), &WeaponTypes::Gauss_Rifle_Jim_Raynor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::C_10_Canister_Rifle.getID(), &WeaponTypes::C_10_Canister_Rifle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Sarah_Kerrigan", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Sarah_Kerrigan));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Sarah_Kerrigan", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Sarah_Kerrigan));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::C_10_Canister_Rifle_Sarah_Kerrigan.getID(), &WeaponTypes::C_10_Canister_Rifle_Sarah_Kerrigan));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Samir_Duran", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Samir_Duran));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Samir_Duran", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Samir_Duran));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::C_10_Canister_Rifle_Samir_Duran.getID(), &WeaponTypes::C_10_Canister_Rifle_Samir_Duran));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Infested_Duran", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Infested_Duran));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Infested_Duran", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Infested_Duran));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::C_10_Canister_Rifle_Infested_Duran.getID(), &WeaponTypes::C_10_Canister_Rifle_Infested_Duran));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Alexei_Stukov", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Alexei_Stukov));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "C_10_Canister_Rifle_Alexei_Stukov", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::C_10_Canister_Rifle_Alexei_Stukov));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::C_10_Canister_Rifle_Alexei_Stukov.getID(), &WeaponTypes::C_10_Canister_Rifle_Alexei_Stukov));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fragmentation_Grenade", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Fragmentation_Grenade));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fragmentation_Grenade", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Fragmentation_Grenade));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Fragmentation_Grenade.getID(), &WeaponTypes::Fragmentation_Grenade));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fragmentation_Grenade_Jim_Raynor", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Fragmentation_Grenade_Jim_Raynor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fragmentation_Grenade_Jim_Raynor", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Fragmentation_Grenade_Jim_Raynor));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Fragmentation_Grenade_Jim_Raynor.getID(), &WeaponTypes::Fragmentation_Grenade_Jim_Raynor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spider_Mines", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Spider_Mines));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spider_Mines", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Spider_Mines));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Spider_Mines.getID(), &WeaponTypes::Spider_Mines));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Twin_Autocannons", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Twin_Autocannons));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Twin_Autocannons", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Twin_Autocannons));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Twin_Autocannons.getID(), &WeaponTypes::Twin_Autocannons));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Twin_Autocannons_Alan_Schezar", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Twin_Autocannons_Alan_Schezar));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Twin_Autocannons_Alan_Schezar", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Twin_Autocannons_Alan_Schezar));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Twin_Autocannons_Alan_Schezar.getID(), &WeaponTypes::Twin_Autocannons_Alan_Schezar));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Hellfire_Missile_Pack.getID(), &WeaponTypes::Hellfire_Missile_Pack));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack_Alan_Schezar", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack_Alan_Schezar));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack_Alan_Schezar", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack_Alan_Schezar));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Hellfire_Missile_Pack_Alan_Schezar.getID(), &WeaponTypes::Hellfire_Missile_Pack_Alan_Schezar));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Cannon", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Cannon", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Cannon));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Arclite_Cannon.getID(), &WeaponTypes::Arclite_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Cannon_Edmund_Duke", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Cannon_Edmund_Duke));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Cannon_Edmund_Duke", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Cannon_Edmund_Duke));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Arclite_Cannon_Edmund_Duke.getID(), &WeaponTypes::Arclite_Cannon_Edmund_Duke));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fusion_Cutter", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Fusion_Cutter));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Fusion_Cutter", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Fusion_Cutter));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Fusion_Cutter.getID(), &WeaponTypes::Fusion_Cutter));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gemini_Missiles", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gemini_Missiles));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gemini_Missiles", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gemini_Missiles));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Gemini_Missiles.getID(), &WeaponTypes::Gemini_Missiles));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gemini_Missiles_Tom_Kazansky", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gemini_Missiles_Tom_Kazansky));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Gemini_Missiles_Tom_Kazansky", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Gemini_Missiles_Tom_Kazansky));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Gemini_Missiles_Tom_Kazansky.getID(), &WeaponTypes::Gemini_Missiles_Tom_Kazansky));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burst_Lasers", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Burst_Lasers));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burst_Lasers", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Burst_Lasers));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Burst_Lasers.getID(), &WeaponTypes::Burst_Lasers));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burst_Lasers_Tom_Kazansky", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Burst_Lasers_Tom_Kazansky));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Burst_Lasers_Tom_Kazansky", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Burst_Lasers_Tom_Kazansky));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Burst_Lasers_Tom_Kazansky.getID(), &WeaponTypes::Burst_Lasers_Tom_Kazansky));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_Laser_Battery", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATS_Laser_Battery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_Laser_Battery", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATS_Laser_Battery));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::ATS_Laser_Battery.getID(), &WeaponTypes::ATS_Laser_Battery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_Laser_Battery_Hero", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATS_Laser_Battery_Hero));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_Laser_Battery_Hero", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATS_Laser_Battery_Hero));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::ATS_Laser_Battery_Hero.getID(), &WeaponTypes::ATS_Laser_Battery_Hero));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_Laser_Battery_Hyperion", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATS_Laser_Battery_Hyperion));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATS_Laser_Battery_Hyperion", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATS_Laser_Battery_Hyperion));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::ATS_Laser_Battery_Hyperion.getID(), &WeaponTypes::ATS_Laser_Battery_Hyperion));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATA_Laser_Battery", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATA_Laser_Battery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATA_Laser_Battery", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATA_Laser_Battery));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::ATA_Laser_Battery.getID(), &WeaponTypes::ATA_Laser_Battery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATA_Laser_Battery_Hero", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATA_Laser_Battery_Hero));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATA_Laser_Battery_Hero", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATA_Laser_Battery_Hero));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::ATA_Laser_Battery_Hero.getID(), &WeaponTypes::ATA_Laser_Battery_Hero));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATA_Laser_Battery_Hyperion", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATA_Laser_Battery_Hyperion));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "ATA_Laser_Battery_Hyperion", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::ATA_Laser_Battery_Hyperion));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::ATA_Laser_Battery_Hyperion.getID(), &WeaponTypes::ATA_Laser_Battery_Hyperion));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Flame_Thrower", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Flame_Thrower));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Flame_Thrower", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Flame_Thrower));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Flame_Thrower.getID(), &WeaponTypes::Flame_Thrower));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Flame_Thrower_Gui_Montag", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Flame_Thrower_Gui_Montag));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Flame_Thrower_Gui_Montag", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Flame_Thrower_Gui_Montag));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Flame_Thrower_Gui_Montag.getID(), &WeaponTypes::Flame_Thrower_Gui_Montag));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Shock_Cannon", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Shock_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Shock_Cannon", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Shock_Cannon));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Arclite_Shock_Cannon.getID(), &WeaponTypes::Arclite_Shock_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Shock_Cannon_Edmund_Duke", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Shock_Cannon_Edmund_Duke));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Arclite_Shock_Cannon_Edmund_Duke", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Arclite_Shock_Cannon_Edmund_Duke));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Arclite_Shock_Cannon_Edmund_Duke.getID(), &WeaponTypes::Arclite_Shock_Cannon_Edmund_Duke));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Longbolt_Missile", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Longbolt_Missile));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Longbolt_Missile", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Longbolt_Missile));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Longbolt_Missile.getID(), &WeaponTypes::Longbolt_Missile));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Claws", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Claws));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Claws", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Claws));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Claws.getID(), &WeaponTypes::Claws));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Claws_Devouring_One", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Claws_Devouring_One));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Claws_Devouring_One", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Claws_Devouring_One));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Claws_Devouring_One.getID(), &WeaponTypes::Claws_Devouring_One));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Claws_Infested_Kerrigan", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Claws_Infested_Kerrigan));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Claws_Infested_Kerrigan", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Claws_Infested_Kerrigan));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Claws_Infested_Kerrigan.getID(), &WeaponTypes::Claws_Infested_Kerrigan));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Needle_Spines", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Needle_Spines));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Needle_Spines", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Needle_Spines));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Needle_Spines.getID(), &WeaponTypes::Needle_Spines));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Needle_Spines_Hunter_Killer", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Needle_Spines_Hunter_Killer));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Needle_Spines_Hunter_Killer", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Needle_Spines_Hunter_Killer));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Needle_Spines_Hunter_Killer.getID(), &WeaponTypes::Needle_Spines_Hunter_Killer));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Kaiser_Blades", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Kaiser_Blades));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Kaiser_Blades", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Kaiser_Blades));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Kaiser_Blades.getID(), &WeaponTypes::Kaiser_Blades));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Kaiser_Blades_Torrasque", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Kaiser_Blades_Torrasque));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Kaiser_Blades_Torrasque", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Kaiser_Blades_Torrasque));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Kaiser_Blades_Torrasque.getID(), &WeaponTypes::Kaiser_Blades_Torrasque));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Toxic_Spores", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Toxic_Spores));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Toxic_Spores", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Toxic_Spores));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Toxic_Spores.getID(), &WeaponTypes::Toxic_Spores));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spines", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Spines));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spines", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Spines));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Spines.getID(), &WeaponTypes::Spines));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Acid_Spore", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Acid_Spore));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Acid_Spore", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Acid_Spore));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Acid_Spore.getID(), &WeaponTypes::Acid_Spore));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Acid_Spore_Kukulza", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Acid_Spore_Kukulza));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Acid_Spore_Kukulza", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Acid_Spore_Kukulza));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Acid_Spore_Kukulza.getID(), &WeaponTypes::Acid_Spore_Kukulza));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Glave_Wurm", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Glave_Wurm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Glave_Wurm", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Glave_Wurm));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Glave_Wurm.getID(), &WeaponTypes::Glave_Wurm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Glave_Wurm_Kukulza", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Glave_Wurm_Kukulza));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Glave_Wurm_Kukulza", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Glave_Wurm_Kukulza));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Glave_Wurm_Kukulza.getID(), &WeaponTypes::Glave_Wurm_Kukulza));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Seeker_Spores", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Seeker_Spores));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Seeker_Spores", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Seeker_Spores));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Seeker_Spores.getID(), &WeaponTypes::Seeker_Spores));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Subterranean_Tentacle", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Subterranean_Tentacle));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Subterranean_Tentacle", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Subterranean_Tentacle));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Subterranean_Tentacle.getID(), &WeaponTypes::Subterranean_Tentacle));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Suicide_Infested_Terran", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Suicide_Infested_Terran));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Suicide_Infested_Terran", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Suicide_Infested_Terran));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Suicide_Infested_Terran.getID(), &WeaponTypes::Suicide_Infested_Terran));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Suicide_Scourge", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Suicide_Scourge));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Suicide_Scourge", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Suicide_Scourge));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Suicide_Scourge.getID(), &WeaponTypes::Suicide_Scourge));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Particle_Beam", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Particle_Beam));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Particle_Beam", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Particle_Beam));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Particle_Beam.getID(), &WeaponTypes::Particle_Beam));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psi_Blades", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psi_Blades));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psi_Blades", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psi_Blades));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Psi_Blades.getID(), &WeaponTypes::Psi_Blades));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psi_Blades_Fenix", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psi_Blades_Fenix));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psi_Blades_Fenix", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psi_Blades_Fenix));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Psi_Blades_Fenix.getID(), &WeaponTypes::Psi_Blades_Fenix));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Phase_Disruptor.getID(), &WeaponTypes::Phase_Disruptor));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor_Fenix", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor_Fenix));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor_Fenix", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor_Fenix));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Phase_Disruptor_Fenix.getID(), &WeaponTypes::Phase_Disruptor_Fenix));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psi_Assault", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psi_Assault));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psi_Assault", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psi_Assault));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Psi_Assault.getID(), &WeaponTypes::Psi_Assault));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Shockwave", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psionic_Shockwave));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Shockwave", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psionic_Shockwave));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Psionic_Shockwave.getID(), &WeaponTypes::Psionic_Shockwave));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Shockwave_TZ_Archon", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psionic_Shockwave_TZ_Archon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Shockwave_TZ_Archon", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psionic_Shockwave_TZ_Archon));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Psionic_Shockwave_TZ_Archon.getID(), &WeaponTypes::Psionic_Shockwave_TZ_Archon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dual_Photon_Blasters));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dual_Photon_Blasters));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Dual_Photon_Blasters.getID(), &WeaponTypes::Dual_Photon_Blasters));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters_Mojo", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dual_Photon_Blasters_Mojo));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters_Mojo", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dual_Photon_Blasters_Mojo));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Dual_Photon_Blasters_Mojo.getID(), &WeaponTypes::Dual_Photon_Blasters_Mojo));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters_Artanis", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dual_Photon_Blasters_Artanis));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dual_Photon_Blasters_Artanis", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dual_Photon_Blasters_Artanis));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Dual_Photon_Blasters_Artanis.getID(), &WeaponTypes::Dual_Photon_Blasters_Artanis));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missiles", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Anti_Matter_Missiles));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missiles", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Anti_Matter_Missiles));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Anti_Matter_Missiles.getID(), &WeaponTypes::Anti_Matter_Missiles));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missiles_Mojo", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Anti_Matter_Missiles_Mojo));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missiles_Mojo", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Anti_Matter_Missiles_Mojo));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Anti_Matter_Missiles_Mojo.getID(), &WeaponTypes::Anti_Matter_Missiles_Mojo));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missiles_Artanis", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Anti_Matter_Missiles_Artanis));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Anti_Matter_Missiles_Artanis", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Anti_Matter_Missiles_Artanis));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Anti_Matter_Missiles_Artanis.getID(), &WeaponTypes::Anti_Matter_Missiles_Artanis));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor_Cannon", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor_Cannon", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor_Cannon));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Phase_Disruptor_Cannon.getID(), &WeaponTypes::Phase_Disruptor_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor_Cannon_Danimoth", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor_Cannon_Danimoth));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Phase_Disruptor_Cannon_Danimoth", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Phase_Disruptor_Cannon_Danimoth));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Phase_Disruptor_Cannon_Danimoth.getID(), &WeaponTypes::Phase_Disruptor_Cannon_Danimoth));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pulse_Cannon", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Pulse_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Pulse_Cannon", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Pulse_Cannon));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Pulse_Cannon.getID(), &WeaponTypes::Pulse_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "STS_Photon_Cannon", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::STS_Photon_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "STS_Photon_Cannon", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::STS_Photon_Cannon));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::STS_Photon_Cannon.getID(), &WeaponTypes::STS_Photon_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "STA_Photon_Cannon", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::STA_Photon_Cannon));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "STA_Photon_Cannon", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::STA_Photon_Cannon));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::STA_Photon_Cannon.getID(), &WeaponTypes::STA_Photon_Cannon));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scarab", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Scarab));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Scarab", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Scarab));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Scarab.getID(), &WeaponTypes::Scarab));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutron_Flare", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Neutron_Flare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Neutron_Flare", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Neutron_Flare));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Neutron_Flare.getID(), &WeaponTypes::Neutron_Flare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Halo_Rockets", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Halo_Rockets));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Halo_Rockets", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Halo_Rockets));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Halo_Rockets.getID(), &WeaponTypes::Halo_Rockets));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Corrosive_Acid", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Corrosive_Acid));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Corrosive_Acid", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Corrosive_Acid));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Corrosive_Acid.getID(), &WeaponTypes::Corrosive_Acid));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Subterranean_Spines", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Subterranean_Spines));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Subterranean_Spines", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Subterranean_Spines));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Subterranean_Spines.getID(), &WeaponTypes::Subterranean_Spines));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Warp_Blades", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Warp_Blades));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Warp_Blades", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Warp_Blades));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Warp_Blades.getID(), &WeaponTypes::Warp_Blades));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Warp_Blades_Hero", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Warp_Blades_Hero));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Warp_Blades_Hero", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Warp_Blades_Hero));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Warp_Blades_Hero.getID(), &WeaponTypes::Warp_Blades_Hero));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Warp_Blades_Zeratul", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Warp_Blades_Zeratul));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Warp_Blades_Zeratul", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Warp_Blades_Zeratul));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Warp_Blades_Zeratul.getID(), &WeaponTypes::Warp_Blades_Zeratul));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Independant_Laser_Battery", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Independant_Laser_Battery));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Independant_Laser_Battery", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Independant_Laser_Battery));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Independant_Laser_Battery.getID(), &WeaponTypes::Independant_Laser_Battery));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Twin_Autocannons_Floor_Trap", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Twin_Autocannons_Floor_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Twin_Autocannons_Floor_Trap", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Twin_Autocannons_Floor_Trap));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Twin_Autocannons_Floor_Trap.getID(), &WeaponTypes::Twin_Autocannons_Floor_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack_Wall_Trap", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack_Wall_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack_Wall_Trap", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack_Wall_Trap));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Hellfire_Missile_Pack_Wall_Trap.getID(), &WeaponTypes::Hellfire_Missile_Pack_Wall_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Flame_Thrower_Wall_Trap", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Flame_Thrower_Wall_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Flame_Thrower_Wall_Trap", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Flame_Thrower_Wall_Trap));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Flame_Thrower_Wall_Trap.getID(), &WeaponTypes::Flame_Thrower_Wall_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack_Floor_Trap", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack_Floor_Trap));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Hellfire_Missile_Pack_Floor_Trap", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Hellfire_Missile_Pack_Floor_Trap));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Hellfire_Missile_Pack_Floor_Trap.getID(), &WeaponTypes::Hellfire_Missile_Pack_Floor_Trap));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Yamato_Gun));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Yamato_Gun", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Yamato_Gun));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Yamato_Gun.getID(), &WeaponTypes::Yamato_Gun));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nuclear_Strike", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Nuclear_Strike));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Nuclear_Strike", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Nuclear_Strike));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Nuclear_Strike.getID(), &WeaponTypes::Nuclear_Strike));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lockdown", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Lockdown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Lockdown", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Lockdown));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Lockdown.getID(), &WeaponTypes::Lockdown));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Shockwave", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::EMP_Shockwave));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "EMP_Shockwave", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::EMP_Shockwave));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::EMP_Shockwave.getID(), &WeaponTypes::EMP_Shockwave));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Irradiate", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Irradiate));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Irradiate", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Irradiate));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Irradiate.getID(), &WeaponTypes::Irradiate));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Parasite", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Parasite));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Parasite", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Parasite));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Parasite.getID(), &WeaponTypes::Parasite));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spawn_Broodlings", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Spawn_Broodlings));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Spawn_Broodlings", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Spawn_Broodlings));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Spawn_Broodlings.getID(), &WeaponTypes::Spawn_Broodlings));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Ensnare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Ensnare", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Ensnare));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Ensnare.getID(), &WeaponTypes::Ensnare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Swarm", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dark_Swarm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Dark_Swarm", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Dark_Swarm));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Dark_Swarm.getID(), &WeaponTypes::Dark_Swarm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Plague));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Plague", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Plague));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Plague.getID(), &WeaponTypes::Plague));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Consume));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Consume", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Consume));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Consume.getID(), &WeaponTypes::Consume));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stasis_Field", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Stasis_Field));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Stasis_Field", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Stasis_Field));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Stasis_Field.getID(), &WeaponTypes::Stasis_Field));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Storm", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psionic_Storm));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Psionic_Storm", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Psionic_Storm));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Psionic_Storm.getID(), &WeaponTypes::Psionic_Storm));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Disruption_Web", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Disruption_Web));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Disruption_Web", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Disruption_Web));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Disruption_Web.getID(), &WeaponTypes::Disruption_Web));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Restoration", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Restoration));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Restoration", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Restoration));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Restoration.getID(), &WeaponTypes::Restoration));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Mind_Control", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Mind_Control));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Mind_Control", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Mind_Control));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Mind_Control.getID(), &WeaponTypes::Mind_Control));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Feedback", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Feedback));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Feedback", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Feedback));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Feedback.getID(), &WeaponTypes::Feedback));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Optical_Flare));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Optical_Flare", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Optical_Flare));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Optical_Flare.getID(), &WeaponTypes::Optical_Flare));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Maelstrom", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Maelstrom));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Maelstrom", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Maelstrom));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Maelstrom.getID(), &WeaponTypes::Maelstrom));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::None));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "None", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::None));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::None.getID(), &WeaponTypes::None));
-env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi4/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Unknown));
+env->SetStaticObjectField(cls, env->GetStaticFieldID(cls, "Unknown", "Lbwapi/WeaponType;"), env->CallStaticObjectMethod(cls, getId, (jlong)&WeaponTypes::Unknown));
 tableWeaponType.insert(std::pair<int, const WeaponType*>(WeaponTypes::Unknown.getID(), &WeaponTypes::Unknown));
 println("Connecting to Broodwar...");
 		reconnect();
 		println("Connection successful, starting match...");
 
 		cls = env->GetObjectClass(obj);
-		jclass gamecls = env->FindClass("Lbwapi4/Game;");
-		jclass unitCls = env->FindClass("Lbwapi4/Unit;");
-		jclass playerCls = env->FindClass("Lbwapi4/Player;");
-		jclass posCls = env->FindClass("Lbwapi4/Position;");
-		jobject moduleObj = env->GetObjectField(obj, env->GetFieldID(cls, "module", "Lbwapi4/AIModule;"));
+		jclass gamecls = env->FindClass("Lbwapi/Game;");
+		jclass unitCls = env->FindClass("Lbwapi/Unit;");
+		jclass playerCls = env->FindClass("Lbwapi/Player;");
+		jclass posCls = env->FindClass("Lbwapi/Position;");
+		jobject moduleObj = env->GetObjectField(obj, env->GetFieldID(cls, "module", "Lbwapi/AIModule;"));
 		jclass moduleCls = env->GetObjectClass(moduleObj);
-		env->SetObjectField(obj, env->GetFieldID(cls, "game", "Lbwapi4/Game;"), env->CallStaticObjectMethod(gamecls, env->GetStaticMethodID(gamecls, "get", "(J)Lbwapi4/Game;"), (long)BroodwarPtr));
+		env->SetObjectField(obj, env->GetFieldID(cls, "game", "Lbwapi/Game;"), env->CallStaticObjectMethod(gamecls, env->GetStaticMethodID(gamecls, "get", "(J)Lbwapi/Game;"), (long)BroodwarPtr));
 
 		jmethodID updateMethodID = env->GetMethodID(env->GetObjectClass(obj), "update", "()V");
 		jmethodID matchStartCallback = env->GetMethodID(moduleCls, "onStart", "()V");
 		jmethodID matchEndCallback = env->GetMethodID(moduleCls, "onEnd", "(Z)V");
 		jmethodID matchFrameCallback = env->GetMethodID(moduleCls, "onFrame", "()V");
 		jmethodID sendTextCallback = env->GetMethodID(moduleCls, "onSendText", "(Ljava/lang/String;)V");
-		jmethodID receiveTextCallback = env->GetMethodID(moduleCls, "onReceiveText", "(Lbwapi4/Player;Ljava/lang/String;)V");
-		jmethodID playerLeftCallback = env->GetMethodID(moduleCls, "onPlayerLeft", "(Lbwapi4/Player;)V");
-		jmethodID nukeDetectCallback = env->GetMethodID(moduleCls, "onNukeDetect", "(Lbwapi4/Position;)V");
-		jmethodID unitDiscoverCallback = env->GetMethodID(moduleCls, "onUnitDiscover", "(Lbwapi4/Unit;)V");
-		jmethodID unitEvadeCallback = env->GetMethodID(moduleCls, "onUnitEvade", "(Lbwapi4/Unit;)V");
-		jmethodID unitShowCallback = env->GetMethodID(moduleCls, "onUnitShow", "(Lbwapi4/Unit;)V");
-		jmethodID unitHideCallback = env->GetMethodID(moduleCls, "onUnitHide", "(Lbwapi4/Unit;)V");
-		jmethodID unitCreateCallback = env->GetMethodID(moduleCls, "onUnitCreate", "(Lbwapi4/Unit;)V");
-		jmethodID unitDestroyCallback = env->GetMethodID(moduleCls, "onUnitDestroy", "(Lbwapi4/Unit;)V");
-		jmethodID unitMorphCallback = env->GetMethodID(moduleCls, "onUnitMorph", "(Lbwapi4/Unit;)V");
-		jmethodID unitRenegadeCallback = env->GetMethodID(moduleCls, "onUnitRenegade", "(Lbwapi4/Unit;)V");
+		jmethodID receiveTextCallback = env->GetMethodID(moduleCls, "onReceiveText", "(Lbwapi/Player;Ljava/lang/String;)V");
+		jmethodID playerLeftCallback = env->GetMethodID(moduleCls, "onPlayerLeft", "(Lbwapi/Player;)V");
+		jmethodID nukeDetectCallback = env->GetMethodID(moduleCls, "onNukeDetect", "(Lbwapi/Position;)V");
+		jmethodID unitDiscoverCallback = env->GetMethodID(moduleCls, "onUnitDiscover", "(Lbwapi/Unit;)V");
+		jmethodID unitEvadeCallback = env->GetMethodID(moduleCls, "onUnitEvade", "(Lbwapi/Unit;)V");
+		jmethodID unitShowCallback = env->GetMethodID(moduleCls, "onUnitShow", "(Lbwapi/Unit;)V");
+		jmethodID unitHideCallback = env->GetMethodID(moduleCls, "onUnitHide", "(Lbwapi/Unit;)V");
+		jmethodID unitCreateCallback = env->GetMethodID(moduleCls, "onUnitCreate", "(Lbwapi/Unit;)V");
+		jmethodID unitDestroyCallback = env->GetMethodID(moduleCls, "onUnitDestroy", "(Lbwapi/Unit;)V");
+		jmethodID unitMorphCallback = env->GetMethodID(moduleCls, "onUnitMorph", "(Lbwapi/Unit;)V");
+		jmethodID unitRenegadeCallback = env->GetMethodID(moduleCls, "onUnitRenegade", "(Lbwapi/Unit;)V");
 		jmethodID saveGameCallback = env->GetMethodID(moduleCls, "onSaveGame", "(Ljava/lang/String;)V");
-		jmethodID unitCompleteCallback = env->GetMethodID(moduleCls, "onUnitComplete", "(Lbwapi4/Unit;)V");
-		jmethodID playerDroppedCallback = env->GetMethodID(moduleCls, "onPlayerDropped", "(Lbwapi4/Player;)V");
+		jmethodID unitCompleteCallback = env->GetMethodID(moduleCls, "onUnitComplete", "(Lbwapi/Unit;)V");
+		jmethodID playerDroppedCallback = env->GetMethodID(moduleCls, "onPlayerDropped", "(Lbwapi/Player;)V");
 		while (true) {
 
 				println("Waiting...");
@@ -7448,43 +7433,43 @@ while ( !Broodwar->isInGame() )
 							  env->CallVoidMethod(moduleObj, sendTextCallback,  env->NewStringUTF(it->getText().c_str()));
 						  break;
 						  case EventType::ReceiveText:
-							  env->CallVoidMethod(moduleObj, receiveTextCallback, env->CallStaticObjectMethod(playerCls, env->GetStaticMethodID(playerCls, "get", "(J)Lbwapi4/Player;"), (jlong)it->getPlayer()), env->NewStringUTF(it->getText().c_str()));
+							  env->CallVoidMethod(moduleObj, receiveTextCallback, env->CallStaticObjectMethod(playerCls, env->GetStaticMethodID(playerCls, "get", "(J)Lbwapi/Player;"), (jlong)it->getPlayer()), env->NewStringUTF(it->getText().c_str()));
 						  break;
 						  case EventType::PlayerLeft:
-							  env->CallVoidMethod(moduleObj, playerLeftCallback, env->CallStaticObjectMethod(playerCls, env->GetStaticMethodID(playerCls, "get", "(J)Lbwapi4/Player;"), (jlong)it->getPlayer()));
+							  env->CallVoidMethod(moduleObj, playerLeftCallback, env->CallStaticObjectMethod(playerCls, env->GetStaticMethodID(playerCls, "get", "(J)Lbwapi/Player;"), (jlong)it->getPlayer()));
 						  break;
 						  case EventType::NukeDetect:
 							  env->CallVoidMethod(moduleObj, nukeDetectCallback, env->NewObject(posCls, env->GetMethodID(posCls,"<init>", "(II)V"), it->getPosition().x, it->getPosition().y));
 						  break;
 						  case EventType::UnitDiscover:
-							  env->CallVoidMethod(moduleObj, unitDiscoverCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitDiscoverCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						  case EventType::UnitEvade:
-							  env->CallVoidMethod(moduleObj, unitEvadeCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitEvadeCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						   case EventType::UnitShow:
-							  env->CallVoidMethod(moduleObj, unitShowCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitShowCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						  case EventType::UnitHide:
-							  env->CallVoidMethod(moduleObj, unitHideCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitHideCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						  case EventType::UnitCreate:
-							  env->CallVoidMethod(moduleObj, unitCreateCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitCreateCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						  case EventType::UnitDestroy:
-							  env->CallVoidMethod(moduleObj, unitDestroyCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitDestroyCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						  case EventType::UnitMorph:
-							  env->CallVoidMethod(moduleObj, unitMorphCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitMorphCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						  case EventType::UnitRenegade:
-							  env->CallVoidMethod(moduleObj, unitRenegadeCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitRenegadeCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 						  case EventType::SaveGame:
 							  env->CallVoidMethod(moduleObj, saveGameCallback, env->NewStringUTF(it->getText().c_str()));
 						  break;
 						  case EventType::UnitComplete:
-							  env->CallVoidMethod(moduleObj, unitCompleteCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi4/Unit;"), (jlong)it->getUnit()));
+							  env->CallVoidMethod(moduleObj, unitCompleteCallback, env->CallStaticObjectMethod(unitCls, env->GetStaticMethodID(unitCls, "get", "(J)Lbwapi/Unit;"), (jlong)it->getUnit()));
 						  break;
 
 					  }
diff --git a/compiled4/bwapi/AIModule.class b/compiled4/bwapi/AIModule.class
new file mode 100644
index 0000000..5a11cbc
Binary files /dev/null and b/compiled4/bwapi/AIModule.class differ
diff --git a/compiled4/bwapi/AbstractPoint.class b/compiled4/bwapi/AbstractPoint.class
new file mode 100644
index 0000000..2632337
Binary files /dev/null and b/compiled4/bwapi/AbstractPoint.class differ
diff --git a/compiled4/bwapi/BWEventListener.class b/compiled4/bwapi/BWEventListener.class
new file mode 100644
index 0000000..6e9b3f2
Binary files /dev/null and b/compiled4/bwapi/BWEventListener.class differ
diff --git a/compiled4/bwapi/BestFilter.class b/compiled4/bwapi/BestFilter.class
new file mode 100644
index 0000000..5d1d21c
Binary files /dev/null and b/compiled4/bwapi/BestFilter.class differ
diff --git a/compiled4/bwapi/BestUnitFilter.class b/compiled4/bwapi/BestUnitFilter.class
new file mode 100644
index 0000000..fe1ec29
Binary files /dev/null and b/compiled4/bwapi/BestUnitFilter.class differ
diff --git a/compiled4/bwapi/Bullet.class b/compiled4/bwapi/Bullet.class
new file mode 100644
index 0000000..3a290ca
Binary files /dev/null and b/compiled4/bwapi/Bullet.class differ
diff --git a/compiled4/bwapi/BulletType.class b/compiled4/bwapi/BulletType.class
new file mode 100644
index 0000000..c9c83f8
Binary files /dev/null and b/compiled4/bwapi/BulletType.class differ
diff --git a/compiled4/bwapi/Bulletset.class b/compiled4/bwapi/Bulletset.class
new file mode 100644
index 0000000..7509b03
Binary files /dev/null and b/compiled4/bwapi/Bulletset.class differ
diff --git a/compiled4/bwapi/CenteredObject.class b/compiled4/bwapi/CenteredObject.class
new file mode 100644
index 0000000..577381b
Binary files /dev/null and b/compiled4/bwapi/CenteredObject.class differ
diff --git a/compiled4/bwapi/Client.class b/compiled4/bwapi/Client.class
new file mode 100644
index 0000000..ae717d7
Binary files /dev/null and b/compiled4/bwapi/Client.class differ
diff --git a/compiled4/bwapi/Color.class b/compiled4/bwapi/Color.class
new file mode 100644
index 0000000..3a21bca
Binary files /dev/null and b/compiled4/bwapi/Color.class differ
diff --git a/compiled4/bwapi/CommandType/Enum.class b/compiled4/bwapi/CommandType/Enum.class
new file mode 100644
index 0000000..8ab67fd
Binary files /dev/null and b/compiled4/bwapi/CommandType/Enum.class differ
diff --git a/compiled4/bwapi/CompareFilter.class b/compiled4/bwapi/CompareFilter.class
new file mode 100644
index 0000000..5275753
Binary files /dev/null and b/compiled4/bwapi/CompareFilter.class differ
diff --git a/compiled4/bwapi/CoordinateType/Enum.class b/compiled4/bwapi/CoordinateType/Enum.class
new file mode 100644
index 0000000..5a6463a
Binary files /dev/null and b/compiled4/bwapi/CoordinateType/Enum.class differ
diff --git a/compiled4/bwapi/DamageType.class b/compiled4/bwapi/DamageType.class
new file mode 100644
index 0000000..83310af
Binary files /dev/null and b/compiled4/bwapi/DamageType.class differ
diff --git a/compiled4/bwapi/DefaultBWListener.class b/compiled4/bwapi/DefaultBWListener.class
new file mode 100644
index 0000000..1aa5eb8
Binary files /dev/null and b/compiled4/bwapi/DefaultBWListener.class differ
diff --git a/compiled4/bwapi/Enum/Enum.class b/compiled4/bwapi/Enum/Enum.class
new file mode 100644
index 0000000..109cfbd
Binary files /dev/null and b/compiled4/bwapi/Enum/Enum.class differ
diff --git a/compiled4/bwapi/Error.class b/compiled4/bwapi/Error.class
new file mode 100644
index 0000000..45bad63
Binary files /dev/null and b/compiled4/bwapi/Error.class differ
diff --git a/compiled4/bwapi/Event.class b/compiled4/bwapi/Event.class
new file mode 100644
index 0000000..ca31849
Binary files /dev/null and b/compiled4/bwapi/Event.class differ
diff --git a/compiled4/bwapi/EventType/Enum.class b/compiled4/bwapi/EventType/Enum.class
new file mode 100644
index 0000000..ec9ff21
Binary files /dev/null and b/compiled4/bwapi/EventType/Enum.class differ
diff --git a/compiled4/bwapi/ExplosionType.class b/compiled4/bwapi/ExplosionType.class
new file mode 100644
index 0000000..24db1a9
Binary files /dev/null and b/compiled4/bwapi/ExplosionType.class differ
diff --git a/compiled4/bwapi/Flag/Enum.class b/compiled4/bwapi/Flag/Enum.class
new file mode 100644
index 0000000..bd90533
Binary files /dev/null and b/compiled4/bwapi/Flag/Enum.class differ
diff --git a/compiled4/bwapi/Force.class b/compiled4/bwapi/Force.class
new file mode 100644
index 0000000..ca8c86d
Binary files /dev/null and b/compiled4/bwapi/Force.class differ
diff --git a/compiled4/bwapi/Forceset.class b/compiled4/bwapi/Forceset.class
new file mode 100644
index 0000000..9088d2a
Binary files /dev/null and b/compiled4/bwapi/Forceset.class differ
diff --git a/compiled4/bwapi/Game.class b/compiled4/bwapi/Game.class
new file mode 100644
index 0000000..02abe08
Binary files /dev/null and b/compiled4/bwapi/Game.class differ
diff --git a/compiled4/bwapi/GameType.class b/compiled4/bwapi/GameType.class
new file mode 100644
index 0000000..3475e30
Binary files /dev/null and b/compiled4/bwapi/GameType.class differ
diff --git a/compiled4/bwapi/Key.class b/compiled4/bwapi/Key.class
new file mode 100644
index 0000000..e3719a2
Binary files /dev/null and b/compiled4/bwapi/Key.class differ
diff --git a/compiled4/bwapi/Latency/Enum.class b/compiled4/bwapi/Latency/Enum.class
new file mode 100644
index 0000000..05d9843
Binary files /dev/null and b/compiled4/bwapi/Latency/Enum.class differ
diff --git a/compiled4/bwapi/Mirror$FrameCallback.class b/compiled4/bwapi/Mirror$FrameCallback.class
new file mode 100644
index 0000000..084a163
Binary files /dev/null and b/compiled4/bwapi/Mirror$FrameCallback.class differ
diff --git a/compiled4/bwapi/Mirror$JarResources.class b/compiled4/bwapi/Mirror$JarResources.class
new file mode 100644
index 0000000..ae402b7
Binary files /dev/null and b/compiled4/bwapi/Mirror$JarResources.class differ
diff --git a/compiled4/bwapi/Mirror.class b/compiled4/bwapi/Mirror.class
new file mode 100644
index 0000000..3d9cd74
Binary files /dev/null and b/compiled4/bwapi/Mirror.class differ
diff --git a/compiled4/bwapi/MouseButton.class b/compiled4/bwapi/MouseButton.class
new file mode 100644
index 0000000..bbd124a
Binary files /dev/null and b/compiled4/bwapi/MouseButton.class differ
diff --git a/compiled4/bwapi/Order.class b/compiled4/bwapi/Order.class
new file mode 100644
index 0000000..d90849b
Binary files /dev/null and b/compiled4/bwapi/Order.class differ
diff --git a/compiled4/bwapi/Player.class b/compiled4/bwapi/Player.class
new file mode 100644
index 0000000..217af17
Binary files /dev/null and b/compiled4/bwapi/Player.class differ
diff --git a/compiled4/bwapi/PlayerType.class b/compiled4/bwapi/PlayerType.class
new file mode 100644
index 0000000..c0fb8bd
Binary files /dev/null and b/compiled4/bwapi/PlayerType.class differ
diff --git a/compiled4/bwapi/Playerset.class b/compiled4/bwapi/Playerset.class
new file mode 100644
index 0000000..12e2f67
Binary files /dev/null and b/compiled4/bwapi/Playerset.class differ
diff --git a/compiled4/bwapi/Position.class b/compiled4/bwapi/Position.class
new file mode 100644
index 0000000..01ca2e5
Binary files /dev/null and b/compiled4/bwapi/Position.class differ
diff --git a/compiled4/bwapi/PositionOrUnit.class b/compiled4/bwapi/PositionOrUnit.class
new file mode 100644
index 0000000..0b0f28d
Binary files /dev/null and b/compiled4/bwapi/PositionOrUnit.class differ
diff --git a/compiled4/bwapi/PositionedObject.class b/compiled4/bwapi/PositionedObject.class
new file mode 100644
index 0000000..965d481
Binary files /dev/null and b/compiled4/bwapi/PositionedObject.class differ
diff --git a/compiled4/bwapi/Race.class b/compiled4/bwapi/Race.class
new file mode 100644
index 0000000..f039ec5
Binary files /dev/null and b/compiled4/bwapi/Race.class differ
diff --git a/compiled4/bwapi/Region.class b/compiled4/bwapi/Region.class
new file mode 100644
index 0000000..a29aed5
Binary files /dev/null and b/compiled4/bwapi/Region.class differ
diff --git a/compiled4/bwapi/Regionset.class b/compiled4/bwapi/Regionset.class
new file mode 100644
index 0000000..3d4b448
Binary files /dev/null and b/compiled4/bwapi/Regionset.class differ
diff --git a/compiled4/bwapi/ShapeType/Enum.class b/compiled4/bwapi/ShapeType/Enum.class
new file mode 100644
index 0000000..32234cb
Binary files /dev/null and b/compiled4/bwapi/ShapeType/Enum.class differ
diff --git a/compiled4/bwapi/TechType.class b/compiled4/bwapi/TechType.class
new file mode 100644
index 0000000..116452a
Binary files /dev/null and b/compiled4/bwapi/TechType.class differ
diff --git a/compiled4/bwapi/Text/Enum.class b/compiled4/bwapi/Text/Enum.class
new file mode 100644
index 0000000..ccf9e24
Binary files /dev/null and b/compiled4/bwapi/Text/Enum.class differ
diff --git a/compiled4/bwapi/Text/Size/Enum.class b/compiled4/bwapi/Text/Size/Enum.class
new file mode 100644
index 0000000..f219dc8
Binary files /dev/null and b/compiled4/bwapi/Text/Size/Enum.class differ
diff --git a/compiled4/bwapi/TilePosition.class b/compiled4/bwapi/TilePosition.class
new file mode 100644
index 0000000..6906878
Binary files /dev/null and b/compiled4/bwapi/TilePosition.class differ
diff --git a/compiled4/bwapi/Tournament/ActionID.class b/compiled4/bwapi/Tournament/ActionID.class
new file mode 100644
index 0000000..734597d
Binary files /dev/null and b/compiled4/bwapi/Tournament/ActionID.class differ
diff --git a/compiled4/bwapi/UnaryFilter.class b/compiled4/bwapi/UnaryFilter.class
new file mode 100644
index 0000000..6bc18c9
Binary files /dev/null and b/compiled4/bwapi/UnaryFilter.class differ
diff --git a/compiled4/bwapi/Unit.class b/compiled4/bwapi/Unit.class
new file mode 100644
index 0000000..8cc5e54
Binary files /dev/null and b/compiled4/bwapi/Unit.class differ
diff --git a/compiled4/bwapi/UnitCommand.class b/compiled4/bwapi/UnitCommand.class
new file mode 100644
index 0000000..89cc284
Binary files /dev/null and b/compiled4/bwapi/UnitCommand.class differ
diff --git a/compiled4/bwapi/UnitCommandType.class b/compiled4/bwapi/UnitCommandType.class
new file mode 100644
index 0000000..e772ecf
Binary files /dev/null and b/compiled4/bwapi/UnitCommandType.class differ
diff --git a/compiled4/bwapi/UnitFilter.class b/compiled4/bwapi/UnitFilter.class
new file mode 100644
index 0000000..af66067
Binary files /dev/null and b/compiled4/bwapi/UnitFilter.class differ
diff --git a/compiled4/bwapi/UnitSizeType.class b/compiled4/bwapi/UnitSizeType.class
new file mode 100644
index 0000000..8f39f06
Binary files /dev/null and b/compiled4/bwapi/UnitSizeType.class differ
diff --git a/compiled4/bwapi/UnitType.class b/compiled4/bwapi/UnitType.class
new file mode 100644
index 0000000..eab29ff
Binary files /dev/null and b/compiled4/bwapi/UnitType.class differ
diff --git a/compiled4/bwapi/Unitset.class b/compiled4/bwapi/Unitset.class
new file mode 100644
index 0000000..8dd9405
Binary files /dev/null and b/compiled4/bwapi/Unitset.class differ
diff --git a/compiled4/bwapi/UpgradeType.class b/compiled4/bwapi/UpgradeType.class
new file mode 100644
index 0000000..aeefecc
Binary files /dev/null and b/compiled4/bwapi/UpgradeType.class differ
diff --git a/compiled4/bwapi/Utils.class b/compiled4/bwapi/Utils.class
new file mode 100644
index 0000000..efc6c88
Binary files /dev/null and b/compiled4/bwapi/Utils.class differ
diff --git a/compiled4/bwapi/WalkPosition.class b/compiled4/bwapi/WalkPosition.class
new file mode 100644
index 0000000..44763c5
Binary files /dev/null and b/compiled4/bwapi/WalkPosition.class differ
diff --git a/compiled4/bwapi/WeaponType.class b/compiled4/bwapi/WeaponType.class
new file mode 100644
index 0000000..88523df
Binary files /dev/null and b/compiled4/bwapi/WeaponType.class differ
diff --git a/concat_header4.h b/concat_header4.h
index 2ccfc4e..d7424f3 100644
--- a/concat_header4.h
+++ b/concat_header4.h
@@ -1,9 +1,9 @@
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
-/* Header for class bwapi4_AbstractPoint */
+/* Header for class bwapi_AbstractPoint */
 
-#ifndef _Included_bwapi4_AbstractPoint
-#define _Included_bwapi4_AbstractPoint
+#ifndef _Included_bwapi_AbstractPoint
+#define _Included_bwapi_AbstractPoint
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -11,10 +11,10 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_AIModule */
+/* Header for class bwapi_AIModule */
 
-#ifndef _Included_bwapi4_AIModule
-#define _Included_bwapi4_AIModule
+#ifndef _Included_bwapi_AIModule
+#define _Included_bwapi_AIModule
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -22,10 +22,10 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_BestFilter */
+/* Header for class bwapi_BestFilter */
 
-#ifndef _Included_bwapi4_BestFilter
-#define _Included_bwapi4_BestFilter
+#ifndef _Included_bwapi_BestFilter
+#define _Included_bwapi_BestFilter
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -33,10 +33,10 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_BestUnitFilter */
+/* Header for class bwapi_BestUnitFilter */
 
-#ifndef _Included_bwapi4_BestUnitFilter
-#define _Included_bwapi4_BestUnitFilter
+#ifndef _Included_bwapi_BestUnitFilter
+#define _Included_bwapi_BestUnitFilter
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -44,133 +44,133 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Bullet */
+/* Header for class bwapi_Bullet */
 
-#ifndef _Included_bwapi4_Bullet
-#define _Included_bwapi4_Bullet
+#ifndef _Included_bwapi_Bullet
+#define _Included_bwapi_Bullet
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getID_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Bullet_getID_1native
+JNIEXPORT jint JNICALL Java_bwapi_Bullet_getID_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    exists_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Bullet_exists_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_exists_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getPlayer_native
- * Signature: (J)Lbwapi4/Player;
+ * Signature: (J)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getPlayer_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getPlayer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getType_native
- * Signature: (J)Lbwapi4/BulletType;
+ * Signature: (J)Lbwapi/BulletType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getSource_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getSource_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getSource_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getAngle_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Bullet_getAngle_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getAngle_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getVelocityX_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Bullet_getVelocityX_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getVelocityX_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getVelocityY_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Bullet_getVelocityY_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getVelocityY_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getTarget_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getTarget_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getTarget_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getTargetPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Bullet_getTargetPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getTargetPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    getRemoveTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Bullet_getRemoveTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Bullet_getRemoveTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    isVisible_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Bullet_isVisible_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_isVisible_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Bullet
+ * Class:     bwapi_Bullet
  * Method:    isVisible_native
- * Signature: (JLbwapi4/Player;)Z
+ * Signature: (JLbwapi/Player;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Bullet_isVisible_1native__JLbwapi4_Player_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_isVisible_1native__JLbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Bulletset */
+/* Header for class bwapi_Bulletset */
 
-#ifndef _Included_bwapi4_Bulletset
-#define _Included_bwapi4_Bulletset
+#ifndef _Included_bwapi_Bulletset
+#define _Included_bwapi_Bulletset
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -178,29 +178,29 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_BulletType */
+/* Header for class bwapi_BulletType */
 
-#ifndef _Included_bwapi4_BulletType
-#define _Included_bwapi4_BulletType
+#ifndef _Included_bwapi_BulletType
+#define _Included_bwapi_BulletType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_BulletType
+ * Class:     bwapi_BulletType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_BulletType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_BulletType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_BWEventListener */
+/* Header for class bwapi_BWEventListener */
 
-#ifndef _Included_bwapi4_BWEventListener
-#define _Included_bwapi4_BWEventListener
+#ifndef _Included_bwapi_BWEventListener
+#define _Included_bwapi_BWEventListener
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -208,10 +208,10 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_CenteredObject */
+/* Header for class bwapi_CenteredObject */
 
-#ifndef _Included_bwapi4_CenteredObject
-#define _Included_bwapi4_CenteredObject
+#ifndef _Included_bwapi_CenteredObject
+#define _Included_bwapi_CenteredObject
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -219,53 +219,53 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Client */
+/* Header for class bwapi_Client */
 
-#ifndef _Included_bwapi4_Client
-#define _Included_bwapi4_Client
+#ifndef _Included_bwapi_Client
+#define _Included_bwapi_Client
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Client
+ * Class:     bwapi_Client
  * Method:    isConnected_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Client_isConnected_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Client_isConnected_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Client
+ * Class:     bwapi_Client
  * Method:    connect_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Client_connect_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Client_connect_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Client
+ * Class:     bwapi_Client
  * Method:    disconnect_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Client_disconnect_1native
+JNIEXPORT void JNICALL Java_bwapi_Client_disconnect_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Client
+ * Class:     bwapi_Client
  * Method:    update_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Client_update_1native
+JNIEXPORT void JNICALL Java_bwapi_Client_update_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Color */
+/* Header for class bwapi_Color */
 
-#ifndef _Included_bwapi4_Color
-#define _Included_bwapi4_Color
+#ifndef _Included_bwapi_Color
+#define _Included_bwapi_Color
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -273,10 +273,10 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_CompareFilter */
+/* Header for class bwapi_CompareFilter */
 
-#ifndef _Included_bwapi4_CompareFilter
-#define _Included_bwapi4_CompareFilter
+#ifndef _Included_bwapi_CompareFilter
+#define _Included_bwapi_CompareFilter
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -284,29 +284,29 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_DamageType */
+/* Header for class bwapi_DamageType */
 
-#ifndef _Included_bwapi4_DamageType
-#define _Included_bwapi4_DamageType
+#ifndef _Included_bwapi_DamageType
+#define _Included_bwapi_DamageType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_DamageType
+ * Class:     bwapi_DamageType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_DamageType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_DamageType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_DefaultBWListener */
+/* Header for class bwapi_DefaultBWListener */
 
-#ifndef _Included_bwapi4_DefaultBWListener
-#define _Included_bwapi4_DefaultBWListener
+#ifndef _Included_bwapi_DefaultBWListener
+#define _Included_bwapi_DefaultBWListener
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -314,2011 +314,1965 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Error */
+/* Header for class bwapi_Error */
 
-#ifndef _Included_bwapi4_Error
-#define _Included_bwapi4_Error
+#ifndef _Included_bwapi_Error
+#define _Included_bwapi_Error
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Error
+ * Class:     bwapi_Error
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Error_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Error_toString_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Event */
+/* Header for class bwapi_Event */
 
-#ifndef _Included_bwapi4_Event
-#define _Included_bwapi4_Event
+#ifndef _Included_bwapi_Event
+#define _Included_bwapi_Event
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Event
+ * Class:     bwapi_Event
  * Method:    getPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Event_getPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Event
+ * Class:     bwapi_Event
  * Method:    getText_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Event_getText_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Event_getText_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Event
+ * Class:     bwapi_Event
  * Method:    getUnit_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Event_getUnit_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getUnit_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Event
+ * Class:     bwapi_Event
  * Method:    getPlayer_native
- * Signature: (J)Lbwapi4/Player;
+ * Signature: (J)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Event_getPlayer_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getPlayer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Event
+ * Class:     bwapi_Event
  * Method:    isWinner_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Event_isWinner_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Event_isWinner_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_ExplosionType */
+/* Header for class bwapi_ExplosionType */
 
-#ifndef _Included_bwapi4_ExplosionType
-#define _Included_bwapi4_ExplosionType
+#ifndef _Included_bwapi_ExplosionType
+#define _Included_bwapi_ExplosionType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_ExplosionType
+ * Class:     bwapi_ExplosionType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_ExplosionType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_ExplosionType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Force */
+/* Header for class bwapi_Force */
 
-#ifndef _Included_bwapi4_Force
-#define _Included_bwapi4_Force
+#ifndef _Included_bwapi_Force
+#define _Included_bwapi_Force
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Force
+ * Class:     bwapi_Force
  * Method:    getID_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Force_getID_1native
+JNIEXPORT jint JNICALL Java_bwapi_Force_getID_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Force
+ * Class:     bwapi_Force
  * Method:    getName_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Force_getName_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Force_getName_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Force
+ * Class:     bwapi_Force
  * Method:    getPlayers_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Force_getPlayers_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Force_getPlayers_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Forceset */
+/* Header for class bwapi_Forceset */
 
-#ifndef _Included_bwapi4_Forceset
-#define _Included_bwapi4_Forceset
+#ifndef _Included_bwapi_Forceset
+#define _Included_bwapi_Forceset
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Forceset
+ * Class:     bwapi_Forceset
  * Method:    getPlayers_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Forceset_getPlayers_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Forceset_getPlayers_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Game */
+/* Header for class bwapi_Game */
 
-#ifndef _Included_bwapi4_Game
-#define _Included_bwapi4_Game
+#ifndef _Included_bwapi_Game
+#define _Included_bwapi_Game
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getForces_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getForces_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getForces_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getPlayers_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getPlayers_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getPlayers_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getAllUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getAllUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getAllUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getMinerals_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getMinerals_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getGeysers_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getGeysers_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getGeysers_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getNeutralUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getNeutralUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getNeutralUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getStaticMinerals_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getStaticMinerals_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getStaticGeysers_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getStaticGeysers_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticGeysers_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getStaticNeutralUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getStaticNeutralUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticNeutralUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getBullets_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBullets_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBullets_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getForce_native
- * Signature: (JI)Lbwapi4/Force;
+ * Signature: (JI)Lbwapi/Force;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getForce_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getForce_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getPlayer_native
- * Signature: (JI)Lbwapi4/Player;
+ * Signature: (JI)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getPlayer_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getPlayer_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getUnit_native
- * Signature: (JI)Lbwapi4/Unit;
+ * Signature: (JI)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getUnit_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getUnit_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    indexToUnit_native
- * Signature: (JI)Lbwapi4/Unit;
+ * Signature: (JI)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_indexToUnit_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_indexToUnit_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getRegion_native
- * Signature: (JI)Lbwapi4/Region;
+ * Signature: (JI)Lbwapi/Region;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getRegion_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegion_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getGameType_native
- * Signature: (J)Lbwapi4/GameType;
+ * Signature: (J)Lbwapi/GameType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getGameType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getGameType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getLatency_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLatency_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatency_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getFrameCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getFrameCount_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getFrameCount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getReplayFrameCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getReplayFrameCount_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getReplayFrameCount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getFPS_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getFPS_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getFPS_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getAverageFPS_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Game_getAverageFPS_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Game_getAverageFPS_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getMousePosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getMousePosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getMousePosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getMouseState_native
- * Signature: (JLbwapi4/MouseButton;)Z
+ * Signature: (JLbwapi/MouseButton;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_getMouseState_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_getMouseState_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getKeyState_native
- * Signature: (JLbwapi4/Key;)Z
+ * Signature: (JLbwapi/Key;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_getKeyState_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_getKeyState_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getScreenPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getScreenPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getScreenPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setScreenPosition_native
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setScreenPosition_1native__JII
+JNIEXPORT void JNICALL Java_bwapi_Game_setScreenPosition_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setScreenPosition_native
- * Signature: (JLbwapi4/Position;)V
+ * Signature: (JLbwapi/Position;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setScreenPosition_1native__JLbwapi4_Position_2
+JNIEXPORT void JNICALL Java_bwapi_Game_setScreenPosition_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    pingMinimap_native
  * Signature: (JII)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_pingMinimap_1native__JII
+JNIEXPORT void JNICALL Java_bwapi_Game_pingMinimap_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    pingMinimap_native
- * Signature: (JLbwapi4/Position;)V
+ * Signature: (JLbwapi/Position;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_pingMinimap_1native__JLbwapi4_Position_2
+JNIEXPORT void JNICALL Java_bwapi_Game_pingMinimap_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isFlagEnabled_native
  * Signature: (JI)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isFlagEnabled_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isFlagEnabled_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    enableFlag_native
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_enableFlag_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_enableFlag_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getLastError_native
- * Signature: (J)Lbwapi4/Error;
+ * Signature: (J)Lbwapi/Error;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getLastError_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getLastError_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setLastError_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setLastError_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setLastError_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setLastError_native
- * Signature: (JLbwapi4/Error;)Z
+ * Signature: (JLbwapi/Error;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setLastError_1native__JLbwapi4_Error_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setLastError_1native__JLbwapi_Error_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    mapWidth_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_mapWidth_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_mapWidth_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    mapHeight_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_mapHeight_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_mapHeight_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    mapFileName_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapFileName_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapFileName_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    mapPathName_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapPathName_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapPathName_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    mapName_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapName_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapName_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    mapHash_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Game_mapHash_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapHash_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isWalkable_native
  * Signature: (JII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isWalkable_1native__JII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isWalkable_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isWalkable_native
- * Signature: (JLbwapi4/WalkPosition;)Z
+ * Signature: (JLbwapi/WalkPosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isWalkable_1native__JLbwapi4_WalkPosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isWalkable_1native__JLbwapi_WalkPosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getGroundHeight_native
  * Signature: (JII)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getGroundHeight_1native__JII
+JNIEXPORT jint JNICALL Java_bwapi_Game_getGroundHeight_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getGroundHeight_native
- * Signature: (JLbwapi4/TilePosition;)I
+ * Signature: (JLbwapi/TilePosition;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getGroundHeight_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jint JNICALL Java_bwapi_Game_getGroundHeight_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isBuildable_native
  * Signature: (JII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isBuildable_native
  * Signature: (JIIZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JIIZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JIIZ
   (JNIEnv *, jobject, jlong, jint, jint, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isBuildable_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isBuildable_native
- * Signature: (JLbwapi4/TilePosition;Z)Z
+ * Signature: (JLbwapi/TilePosition;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBuildable_1native__JLbwapi4_TilePosition_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JLbwapi_TilePosition_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isVisible_native
  * Signature: (JII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isVisible_1native__JII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isVisible_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isVisible_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isVisible_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isVisible_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isExplored_native
  * Signature: (JII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isExplored_1native__JII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isExplored_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isExplored_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isExplored_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isExplored_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasCreep_native
  * Signature: (JII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasCreep_1native__JII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasCreep_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasCreep_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasCreep_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasCreep_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPowerPrecise_native
  * Signature: (JII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPowerPrecise_native
- * Signature: (JIILbwapi4/UnitType;)Z
+ * Signature: (JIILbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JIILbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JIILbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPowerPrecise_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPowerPrecise_native
- * Signature: (JLbwapi4/Position;Lbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/Position;Lbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPowerPrecise_1native__JLbwapi4_Position_2Lbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JLbwapi_Position_2Lbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
  * Signature: (JII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
- * Signature: (JIILbwapi4/UnitType;)Z
+ * Signature: (JIILbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JIILbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIILbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
- * Signature: (JLbwapi4/TilePosition;Lbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
  * Signature: (JIIII)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JIIII
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIIII
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
- * Signature: (JIIIILbwapi4/UnitType;)Z
+ * Signature: (JIIIILbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JIIIILbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIIIILbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
- * Signature: (JLbwapi4/TilePosition;II)Z
+ * Signature: (JLbwapi/TilePosition;II)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2II
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2II
   (JNIEnv *, jobject, jlong, jobject, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPower_native
- * Signature: (JLbwapi4/TilePosition;IILbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/TilePosition;IILbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPower_1native__JLbwapi4_TilePosition_2IILbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2IILbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canBuildHere_native
- * Signature: (JLbwapi4/TilePosition;Lbwapi4/UnitType;Lbwapi4/Unit;)Z
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;Lbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canBuildHere_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2Lbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2Lbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canBuildHere_native
- * Signature: (JLbwapi4/TilePosition;Lbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canBuildHere_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canBuildHere_native
- * Signature: (JLbwapi4/TilePosition;Lbwapi4/UnitType;Lbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;Lbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canBuildHere_1native__JLbwapi4_TilePosition_2Lbwapi4_UnitType_2Lbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2Lbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canMake_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canMake_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canMake_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canMake_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/Unit;)Z
+ * Signature: (JLbwapi/UnitType;Lbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canMake_1native__JLbwapi4_UnitType_2Lbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canMake_1native__JLbwapi_UnitType_2Lbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canResearch_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Unit;)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canResearch_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2Lbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canResearch_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canResearch_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canResearch_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canResearch_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2Lbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canUpgrade_native
- * Signature: (JLbwapi4/UpgradeType;Lbwapi4/Unit;)Z
+ * Signature: (JLbwapi/UpgradeType;Lbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canUpgrade_1native__JLbwapi4_UpgradeType_2Lbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2Lbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canUpgrade_native
- * Signature: (JLbwapi4/UpgradeType;)Z
+ * Signature: (JLbwapi/UpgradeType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canUpgrade_1native__JLbwapi4_UpgradeType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    canUpgrade_native
- * Signature: (JLbwapi4/UpgradeType;Lbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/UpgradeType;Lbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_canUpgrade_1native__JLbwapi4_UpgradeType_2Lbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2Lbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    printf_native
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_printf_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_printf_1native
   (JNIEnv *, jobject, jlong, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    sendText_native
  * Signature: (JLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_sendText_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_sendText_1native
   (JNIEnv *, jobject, jlong, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    sendTextEx_native
  * Signature: (JZLjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_sendTextEx_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_sendTextEx_1native
   (JNIEnv *, jobject, jlong, jboolean, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isInGame_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isInGame_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isInGame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isMultiplayer_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isMultiplayer_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isMultiplayer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isBattleNet_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isBattleNet_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBattleNet_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isPaused_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isPaused_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isPaused_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isReplay_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isReplay_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isReplay_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    pauseGame_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_pauseGame_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_pauseGame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    resumeGame_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_resumeGame_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_resumeGame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    leaveGame_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_leaveGame_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_leaveGame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    restartGame_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_restartGame_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_restartGame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setLocalSpeed_native
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setLocalSpeed_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_setLocalSpeed_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    issueCommand_native
- * Signature: (JLjava/util/List;Lbwapi4/UnitCommand;)Z
+ * Signature: (JLjava/util/List;Lbwapi/UnitCommand;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_issueCommand_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_issueCommand_1native
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getSelectedUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getSelectedUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getSelectedUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    self_native
- * Signature: (J)Lbwapi4/Player;
+ * Signature: (J)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_self_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_self_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    enemy_native
- * Signature: (J)Lbwapi4/Player;
+ * Signature: (J)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_enemy_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_enemy_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    neutral_native
- * Signature: (J)Lbwapi4/Player;
+ * Signature: (J)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_neutral_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_neutral_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    allies_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_allies_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_allies_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    enemies_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_enemies_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_enemies_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    observers_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_observers_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_observers_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setTextSize_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setTextSize_1native__J
+JNIEXPORT void JNICALL Java_bwapi_Game_setTextSize_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setTextSize_native
- * Signature: (JLbwapi4/Text/Size/Enum;)V
+ * Signature: (JLbwapi/Text/Size/Enum;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setTextSize_1native__JLbwapi4_Text_Size_Enum_2
+JNIEXPORT void JNICALL Java_bwapi_Game_setTextSize_1native__JLbwapi_Text_Size_Enum_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawText_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IILjava/lang/String;)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawText_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_drawText_1native
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTextMap_native
  * Signature: (JIILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMap_1native__JIILjava_lang_String_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMap_1native__JIILjava_lang_String_2
   (JNIEnv *, jobject, jlong, jint, jint, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTextMap_native
- * Signature: (JLbwapi4/Position;Ljava/lang/String;)V
+ * Signature: (JLbwapi/Position;Ljava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMap_1native__JLbwapi4_Position_2Ljava_lang_String_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMap_1native__JLbwapi_Position_2Ljava_lang_String_2
   (JNIEnv *, jobject, jlong, jobject, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTextMouse_native
  * Signature: (JIILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMouse_1native__JIILjava_lang_String_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMouse_1native__JIILjava_lang_String_2
   (JNIEnv *, jobject, jlong, jint, jint, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTextMouse_native
- * Signature: (JLbwapi4/Position;Ljava/lang/String;)V
+ * Signature: (JLbwapi/Position;Ljava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextMouse_1native__JLbwapi4_Position_2Ljava_lang_String_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMouse_1native__JLbwapi_Position_2Ljava_lang_String_2
   (JNIEnv *, jobject, jlong, jobject, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTextScreen_native
  * Signature: (JIILjava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextScreen_1native__JIILjava_lang_String_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextScreen_1native__JIILjava_lang_String_2
   (JNIEnv *, jobject, jlong, jint, jint, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTextScreen_native
- * Signature: (JLbwapi4/Position;Ljava/lang/String;)V
+ * Signature: (JLbwapi/Position;Ljava/lang/String;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTextScreen_1native__JLbwapi4_Position_2Ljava_lang_String_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextScreen_1native__JLbwapi_Position_2Ljava_lang_String_2
   (JNIEnv *, jobject, jlong, jobject, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBox_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIIILbwapi4/Color;)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBox_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBox_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBox_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIIILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBox_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBox_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMap_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMap_native
- * Signature: (JIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMap_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMap_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMouse_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMouse_native
- * Signature: (JIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMouse_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxMouse_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxScreen_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxScreen_native
- * Signature: (JIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxScreen_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawBoxScreen_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawBoxScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangle_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIIIIILbwapi4/Color;)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangle_1native__JLbwapi4_CoordinateType_Enum_2IIIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangle_1native__JLbwapi_CoordinateType_Enum_2IIIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangle_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIIIIILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangle_1native__JLbwapi4_CoordinateType_Enum_2IIIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangle_1native__JLbwapi_CoordinateType_Enum_2IIIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMap_native
- * Signature: (JIIIIIILbwapi4/Color;)V
+ * Signature: (JIIIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JIIIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JIIIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMap_native
- * Signature: (JIIIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JIIIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JIIIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMap_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMap_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMouse_native
- * Signature: (JIIIIIILbwapi4/Color;)V
+ * Signature: (JIIIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JIIIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JIIIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMouse_native
- * Signature: (JIIIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JIIIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JIIIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMouse_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleMouse_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleScreen_native
- * Signature: (JIIIIIILbwapi4/Color;)V
+ * Signature: (JIIIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JIIIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JIIIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleScreen_native
- * Signature: (JIIIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JIIIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JIIIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleScreen_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawTriangleScreen_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawTriangleScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircle_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIILbwapi4/Color;)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircle_1native__JLbwapi4_CoordinateType_Enum_2IIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircle_1native__JLbwapi_CoordinateType_Enum_2IIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircle_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircle_1native__JLbwapi4_CoordinateType_Enum_2IIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircle_1native__JLbwapi_CoordinateType_Enum_2IIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMap_native
- * Signature: (JIIILbwapi4/Color;)V
+ * Signature: (JIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMap_native
- * Signature: (JIIILbwapi4/Color;Z)V
+ * Signature: (JIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMap_native
- * Signature: (JLbwapi4/Position;ILbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;ILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JLbwapi4_Position_2ILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JLbwapi_Position_2ILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMap_native
- * Signature: (JLbwapi4/Position;ILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;ILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMap_1native__JLbwapi4_Position_2ILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JLbwapi_Position_2ILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMouse_native
- * Signature: (JIIILbwapi4/Color;)V
+ * Signature: (JIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMouse_native
- * Signature: (JIIILbwapi4/Color;Z)V
+ * Signature: (JIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMouse_native
- * Signature: (JLbwapi4/Position;ILbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;ILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JLbwapi4_Position_2ILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JLbwapi_Position_2ILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleMouse_native
- * Signature: (JLbwapi4/Position;ILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;ILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleMouse_1native__JLbwapi4_Position_2ILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JLbwapi_Position_2ILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleScreen_native
- * Signature: (JIIILbwapi4/Color;)V
+ * Signature: (JIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleScreen_native
- * Signature: (JIIILbwapi4/Color;Z)V
+ * Signature: (JIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleScreen_native
- * Signature: (JLbwapi4/Position;ILbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;ILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JLbwapi4_Position_2ILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JLbwapi_Position_2ILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawCircleScreen_native
- * Signature: (JLbwapi4/Position;ILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;ILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawCircleScreen_1native__JLbwapi4_Position_2ILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JLbwapi_Position_2ILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipse_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIIILbwapi4/Color;)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipse_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipse_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipse_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIIILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipse_1native__JLbwapi4_CoordinateType_Enum_2IIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipse_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMap_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMap_native
- * Signature: (JIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMap_native
- * Signature: (JLbwapi4/Position;IILbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;IILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JLbwapi4_Position_2IILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JLbwapi_Position_2IILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMap_native
- * Signature: (JLbwapi4/Position;IILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;IILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMap_1native__JLbwapi4_Position_2IILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JLbwapi_Position_2IILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMouse_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMouse_native
- * Signature: (JIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMouse_native
- * Signature: (JLbwapi4/Position;IILbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;IILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JLbwapi4_Position_2IILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JLbwapi_Position_2IILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseMouse_native
- * Signature: (JLbwapi4/Position;IILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;IILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseMouse_1native__JLbwapi4_Position_2IILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JLbwapi_Position_2IILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseScreen_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseScreen_native
- * Signature: (JIIIILbwapi4/Color;Z)V
+ * Signature: (JIIIILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JIIIILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JIIIILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseScreen_native
- * Signature: (JLbwapi4/Position;IILbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;IILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JLbwapi4_Position_2IILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JLbwapi_Position_2IILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawEllipseScreen_native
- * Signature: (JLbwapi4/Position;IILbwapi4/Color;Z)V
+ * Signature: (JLbwapi/Position;IILbwapi/Color;Z)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawEllipseScreen_1native__JLbwapi4_Position_2IILbwapi4_Color_2Z
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JLbwapi_Position_2IILbwapi_Color_2Z
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawDot_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IILbwapi4/Color;)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDot_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDot_1native
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawDotMap_native
- * Signature: (JIILbwapi4/Color;)V
+ * Signature: (JIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMap_1native__JIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMap_1native__JIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawDotMap_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMap_1native__JLbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMap_1native__JLbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawDotMouse_native
- * Signature: (JIILbwapi4/Color;)V
+ * Signature: (JIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMouse_1native__JIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMouse_1native__JIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawDotMouse_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotMouse_1native__JLbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMouse_1native__JLbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawDotScreen_native
- * Signature: (JIILbwapi4/Color;)V
+ * Signature: (JIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotScreen_1native__JIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotScreen_1native__JIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawDotScreen_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawDotScreen_1native__JLbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotScreen_1native__JLbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawLine_native
- * Signature: (JLbwapi4/CoordinateType/Enum;IIIILbwapi4/Color;)V
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLine_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLine_1native
   (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawLineMap_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMap_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMap_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawLineMap_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMap_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawLineMouse_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMouse_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMouse_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawLineMouse_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineMouse_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawLineScreen_native
- * Signature: (JIIIILbwapi4/Color;)V
+ * Signature: (JIIIILbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineScreen_1native__JIIIILbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineScreen_1native__JIIIILbwapi_Color_2
   (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    drawLineScreen_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;Lbwapi4/Color;)V
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_drawLineScreen_1native__JLbwapi4_Position_2Lbwapi4_Position_2Lbwapi4_Color_2
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getLatencyFrames_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLatencyFrames_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatencyFrames_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getLatencyTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLatencyTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatencyTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getRemainingLatencyFrames_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getRemainingLatencyFrames_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRemainingLatencyFrames_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getRemainingLatencyTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getRemainingLatencyTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRemainingLatencyTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getRevision_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getRevision_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRevision_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isDebug_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isDebug_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isDebug_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isLatComEnabled_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isLatComEnabled_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isLatComEnabled_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setLatCom_native
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setLatCom_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_setLatCom_1native
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    isGUIEnabled_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_isGUIEnabled_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isGUIEnabled_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setGUI_native
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setGUI_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_setGUI_1native
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getInstanceNumber_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getInstanceNumber_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getInstanceNumber_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getAPM_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getAPM_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Game_getAPM_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getAPM_native
  * Signature: (JZ)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getAPM_1native__JZ
+JNIEXPORT jint JNICALL Java_bwapi_Game_getAPM_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setMap_native
  * Signature: (JLjava/lang/String;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setMap_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setMap_1native
   (JNIEnv *, jobject, jlong, jstring);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setFrameSkip_native
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setFrameSkip_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_setFrameSkip_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    hasPath_native
- * Signature: (JLbwapi4/Position;Lbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;Lbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_hasPath_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPath_1native
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setAlliance_native
- * Signature: (JLbwapi4/Player;Z)Z
+ * Signature: (JLbwapi/Player;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setAlliance_1native__JLbwapi4_Player_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setAlliance_native
- * Signature: (JLbwapi4/Player;)Z
+ * Signature: (JLbwapi/Player;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setAlliance_1native__JLbwapi4_Player_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setAlliance_native
- * Signature: (JLbwapi4/Player;ZZ)Z
+ * Signature: (JLbwapi/Player;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setAlliance_1native__JLbwapi4_Player_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setVision_native
- * Signature: (JLbwapi4/Player;)Z
+ * Signature: (JLbwapi/Player;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setVision_1native__JLbwapi4_Player_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setVision_1native__JLbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setVision_native
- * Signature: (JLbwapi4/Player;Z)Z
+ * Signature: (JLbwapi/Player;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setVision_1native__JLbwapi4_Player_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setVision_1native__JLbwapi_Player_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    elapsedTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_elapsedTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_elapsedTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setCommandOptimizationLevel_native
  * Signature: (JI)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Game_setCommandOptimizationLevel_1native
+JNIEXPORT void JNICALL Java_bwapi_Game_setCommandOptimizationLevel_1native
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    countdownTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_countdownTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_countdownTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getAllRegions_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getAllRegions_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getAllRegions_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getRegionAt_native
- * Signature: (JII)Lbwapi4/Region;
+ * Signature: (JII)Lbwapi/Region;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getRegionAt_1native__JII
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegionAt_1native__JII
   (JNIEnv *, jobject, jlong, jint, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getRegionAt_native
- * Signature: (JLbwapi4/Position;)Lbwapi4/Region;
+ * Signature: (JLbwapi/Position;)Lbwapi/Region;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getRegionAt_1native__JLbwapi4_Position_2
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegionAt_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getLastEventTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getLastEventTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLastEventTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setRevealAll_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setRevealAll_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setRevealAll_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    setRevealAll_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Game_setRevealAll_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setRevealAll_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getBuildLocation_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;I)Lbwapi4/TilePosition;
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;I)Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBuildLocation_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2I
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2I
   (JNIEnv *, jobject, jlong, jobject, jobject, jint);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getBuildLocation_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;)Lbwapi4/TilePosition;
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBuildLocation_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getBuildLocation_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;IZ)Lbwapi4/TilePosition;
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;IZ)Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Game_getBuildLocation_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2IZ
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2IZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jint, jboolean);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getDamageFrom_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/UnitType;Lbwapi4/Player;)I
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageFrom_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getDamageFrom_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageFrom_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getDamageFrom_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/UnitType;Lbwapi4/Player;Lbwapi4/Player;)I
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;Lbwapi/Player;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageFrom_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2Lbwapi4_Player_2
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2Lbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getDamageTo_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/UnitType;Lbwapi4/Player;)I
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageTo_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getDamageTo_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageTo_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Game
+ * Class:     bwapi_Game
  * Method:    getDamageTo_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/UnitType;Lbwapi4/Player;Lbwapi4/Player;)I
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;Lbwapi/Player;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Game_getDamageTo_1native__JLbwapi4_UnitType_2Lbwapi4_UnitType_2Lbwapi4_Player_2Lbwapi4_Player_2
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2Lbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_GameType */
+/* Header for class bwapi_GameType */
 
-#ifndef _Included_bwapi4_GameType
-#define _Included_bwapi4_GameType
+#ifndef _Included_bwapi_GameType
+#define _Included_bwapi_GameType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_GameType
+ * Class:     bwapi_GameType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_GameType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_GameType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_GameWrapper */
+/* Header for class bwapi_Key */
 
-#ifndef _Included_bwapi4_GameWrapper
-#define _Included_bwapi4_GameWrapper
+#ifndef _Included_bwapi_Key
+#define _Included_bwapi_Key
 #ifdef __cplusplus
 extern "C" {
 #endif
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class bwapi_Mirror_FrameCallback */
+
+#ifndef _Included_bwapi_Mirror_FrameCallback
+#define _Included_bwapi_Mirror_FrameCallback
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class bwapi_Mirror_JarResources */
+
+#ifndef _Included_bwapi_Mirror_JarResources
+#define _Included_bwapi_Mirror_JarResources
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
+/* Header for class bwapi_Mirror */
+
+#ifndef _Included_bwapi_Mirror
+#define _Included_bwapi_Mirror
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef bwapi_Mirror_EXTRACT_JAR
+#define bwapi_Mirror_EXTRACT_JAR 1L
 /*
- * Class:     bwapi4_GameWrapper
- * Method:    flush_native
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_bwapi4_GameWrapper_flush_1native
-  (JNIEnv *, jobject, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class bwapi4_InterfaceEvent */
-
-#ifndef _Included_bwapi4_InterfaceEvent
-#define _Included_bwapi4_InterfaceEvent
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     bwapi4_InterfaceEvent
- * Method:    isFinished_native
- * Signature: (J)Z
- */
-JNIEXPORT jboolean JNICALL Java_bwapi4_InterfaceEvent_isFinished_1native
-  (JNIEnv *, jobject, jlong);
-
-/*
- * Class:     bwapi4_InterfaceEvent
- * Method:    removeEvent_native
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_bwapi4_InterfaceEvent_removeEvent_1native
-  (JNIEnv *, jobject, jlong);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class bwapi4_Key */
-
-#ifndef _Included_bwapi4_Key
-#define _Included_bwapi4_Key
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class bwapi4_Mirror_FrameCallback */
-
-#ifndef _Included_bwapi4_Mirror_FrameCallback
-#define _Included_bwapi4_Mirror_FrameCallback
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class bwapi4_Mirror_JarResources */
-
-#ifndef _Included_bwapi4_Mirror_JarResources
-#define _Included_bwapi4_Mirror_JarResources
-#ifdef __cplusplus
-extern "C" {
-#endif
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class bwapi4_Mirror */
-
-#ifndef _Included_bwapi4_Mirror
-#define _Included_bwapi4_Mirror
-#ifdef __cplusplus
-extern "C" {
-#endif
-#undef bwapi4_Mirror_EXTRACT_JAR
-#define bwapi4_Mirror_EXTRACT_JAR 1L
-/*
- * Class:     bwapi4_Mirror
+ * Class:     bwapi_Mirror
  * Method:    startGame
  * Signature: ()V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Mirror_startGame
+JNIEXPORT void JNICALL Java_bwapi_Mirror_startGame
   (JNIEnv *, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_MouseButton */
+/* Header for class bwapi_MouseButton */
 
-#ifndef _Included_bwapi4_MouseButton
-#define _Included_bwapi4_MouseButton
+#ifndef _Included_bwapi_MouseButton
+#define _Included_bwapi_MouseButton
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2326,10 +2280,10 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Order */
+/* Header for class bwapi_Order */
 
-#ifndef _Included_bwapi4_Order
-#define _Included_bwapi4_Order
+#ifndef _Included_bwapi_Order
+#define _Included_bwapi_Order
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -2337,681 +2291,630 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Player */
+/* Header for class bwapi_Player */
 
-#ifndef _Included_bwapi4_Player
-#define _Included_bwapi4_Player
+#ifndef _Included_bwapi_Player
+#define _Included_bwapi_Player
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getID_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getID_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getID_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getName_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Player_getName_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Player_getName_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getRace_native
- * Signature: (J)Lbwapi4/Race;
+ * Signature: (J)Lbwapi/Race;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getRace_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getRace_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getType_native
- * Signature: (J)Lbwapi4/PlayerType;
+ * Signature: (J)Lbwapi/PlayerType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getForce_native
- * Signature: (J)Lbwapi4/Force;
+ * Signature: (J)Lbwapi/Force;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getForce_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getForce_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isAlly_native
- * Signature: (JLbwapi4/Player;)Z
+ * Signature: (JLbwapi/Player;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isAlly_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isAlly_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isEnemy_native
- * Signature: (JLbwapi4/Player;)Z
+ * Signature: (JLbwapi/Player;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isEnemy_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isEnemy_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isNeutral_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isNeutral_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isNeutral_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getStartLocation_native
- * Signature: (J)Lbwapi4/TilePosition;
+ * Signature: (J)Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getStartLocation_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getStartLocation_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isVictorious_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isVictorious_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isVictorious_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isDefeated_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isDefeated_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isDefeated_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    leftGame_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_leftGame_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_leftGame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    minerals_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_minerals_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_minerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    gas_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_gas_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_gas_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    gatheredMinerals_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_gatheredMinerals_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_gatheredMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    gatheredGas_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_gatheredGas_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_gatheredGas_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    repairedMinerals_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_repairedMinerals_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_repairedMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    repairedGas_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_repairedGas_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_repairedGas_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    refundedMinerals_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_refundedMinerals_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_refundedMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    refundedGas_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_refundedGas_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_refundedGas_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    spentMinerals_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_spentMinerals_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_spentMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    spentGas_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_spentGas_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_spentGas_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    supplyTotal_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyTotal_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyTotal_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    supplyTotal_native
- * Signature: (JLbwapi4/Race;)I
+ * Signature: (JLbwapi/Race;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyTotal_1native__JLbwapi4_Race_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyTotal_1native__JLbwapi_Race_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    supplyUsed_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyUsed_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyUsed_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    supplyUsed_native
- * Signature: (JLbwapi4/Race;)I
+ * Signature: (JLbwapi/Race;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_supplyUsed_1native__JLbwapi4_Race_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyUsed_1native__JLbwapi_Race_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    allUnitCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_allUnitCount_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_allUnitCount_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    allUnitCount_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_allUnitCount_1native__JLbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_allUnitCount_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    visibleUnitCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_visibleUnitCount_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_visibleUnitCount_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    visibleUnitCount_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_visibleUnitCount_1native__JLbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_visibleUnitCount_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    completedUnitCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_completedUnitCount_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_completedUnitCount_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    completedUnitCount_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_completedUnitCount_1native__JLbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_completedUnitCount_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    incompleteUnitCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_incompleteUnitCount_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_incompleteUnitCount_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    incompleteUnitCount_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_incompleteUnitCount_1native__JLbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_incompleteUnitCount_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    deadUnitCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_deadUnitCount_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_deadUnitCount_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    deadUnitCount_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_deadUnitCount_1native__JLbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_deadUnitCount_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    killedUnitCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_killedUnitCount_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_Player_killedUnitCount_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    killedUnitCount_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_killedUnitCount_1native__JLbwapi4_UnitType_2
+JNIEXPORT jint JNICALL Java_bwapi_Player_killedUnitCount_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getUpgradeLevel_native
- * Signature: (JLbwapi4/UpgradeType;)I
+ * Signature: (JLbwapi/UpgradeType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getUpgradeLevel_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getUpgradeLevel_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    hasResearched_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_hasResearched_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_hasResearched_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isResearching_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isResearching_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isResearching_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isUpgrading_native
- * Signature: (JLbwapi4/UpgradeType;)Z
+ * Signature: (JLbwapi/UpgradeType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isUpgrading_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isUpgrading_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getColor_native
- * Signature: (J)Lbwapi4/Color;
+ * Signature: (J)Lbwapi/Color;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Player_getColor_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getColor_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getTextColor_native
  * Signature: (J)C
  */
-JNIEXPORT jchar JNICALL Java_bwapi4_Player_getTextColor_1native
+JNIEXPORT jchar JNICALL Java_bwapi_Player_getTextColor_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    maxEnergy_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_maxEnergy_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_maxEnergy_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    topSpeed_native
- * Signature: (JLbwapi4/UnitType;)D
+ * Signature: (JLbwapi/UnitType;)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Player_topSpeed_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Player_topSpeed_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    weaponMaxRange_native
- * Signature: (JLbwapi4/WeaponType;)I
+ * Signature: (JLbwapi/WeaponType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_weaponMaxRange_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_weaponMaxRange_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    sightRange_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_sightRange_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_sightRange_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    weaponDamageCooldown_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_weaponDamageCooldown_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_weaponDamageCooldown_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    armor_native
- * Signature: (JLbwapi4/UnitType;)I
+ * Signature: (JLbwapi/UnitType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_armor_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_armor_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    damage_native
- * Signature: (JLbwapi4/WeaponType;)I
+ * Signature: (JLbwapi/WeaponType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_damage_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_damage_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getUnitScore_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getUnitScore_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getUnitScore_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getKillScore_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getKillScore_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getKillScore_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getBuildingScore_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getBuildingScore_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getBuildingScore_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getRazingScore_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getRazingScore_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getRazingScore_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getCustomScore_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getCustomScore_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getCustomScore_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isObserver_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isObserver_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isObserver_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    getMaxUpgradeLevel_native
- * Signature: (JLbwapi4/UpgradeType;)I
+ * Signature: (JLbwapi/UpgradeType;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Player_getMaxUpgradeLevel_1native
+JNIEXPORT jint JNICALL Java_bwapi_Player_getMaxUpgradeLevel_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isResearchAvailable_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isResearchAvailable_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isResearchAvailable_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Player
+ * Class:     bwapi_Player
  * Method:    isUnitAvailable_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Player_isUnitAvailable_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isUnitAvailable_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Playerset */
+/* Header for class bwapi_Playerset */
 
-#ifndef _Included_bwapi4_Playerset
-#define _Included_bwapi4_Playerset
+#ifndef _Included_bwapi_Playerset
+#define _Included_bwapi_Playerset
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Playerset
+ * Class:     bwapi_Playerset
  * Method:    getUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Playerset_getUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Playerset_getUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Playerset
+ * Class:     bwapi_Playerset
  * Method:    setAlliance_native
  * Signature: (JZ)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Playerset_setAlliance_1native__JZ
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Playerset
+ * Class:     bwapi_Playerset
  * Method:    setAlliance_native
  * Signature: (J)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Playerset_setAlliance_1native__J
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Playerset
+ * Class:     bwapi_Playerset
  * Method:    setAlliance_native
  * Signature: (JZZ)V
  */
-JNIEXPORT void JNICALL Java_bwapi4_Playerset_setAlliance_1native__JZZ
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_PlayerType */
+/* Header for class bwapi_PlayerType */
 
-#ifndef _Included_bwapi4_PlayerType
-#define _Included_bwapi4_PlayerType
+#ifndef _Included_bwapi_PlayerType
+#define _Included_bwapi_PlayerType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_PlayerType
+ * Class:     bwapi_PlayerType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_PlayerType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_PlayerType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_PlayerType
+ * Class:     bwapi_PlayerType
  * Method:    isLobbyType_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_PlayerType_isLobbyType_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_PlayerType_isLobbyType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_PlayerType
+ * Class:     bwapi_PlayerType
  * Method:    isGameType_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_PlayerType_isGameType_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_PlayerType_isGameType_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Point */
+/* Header for class bwapi_Position */
 
-#ifndef _Included_bwapi4_Point
-#define _Included_bwapi4_Point
+#ifndef _Included_bwapi_Position
+#define _Included_bwapi_Position
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Point
+ * Class:     bwapi_Position
  * Method:    isValid
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Point_isValid
+JNIEXPORT jboolean JNICALL Java_bwapi_Position_isValid
   (JNIEnv *, jobject);
 
 /*
- * Class:     bwapi4_Point
+ * Class:     bwapi_Position
  * Method:    makeValid
- * Signature: ()Lbwapi4/Point;
+ * Signature: ()Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Point_makeValid
+JNIEXPORT jobject JNICALL Java_bwapi_Position_makeValid
   (JNIEnv *, jobject);
 
 /*
- * Class:     bwapi4_Point
- * Method:    getDistance
- * Signature: (Lbwapi4/Point;)D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Point_getDistance
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     bwapi4_Point
- * Method:    getLength
- * Signature: ()D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Point_getLength
-  (JNIEnv *, jobject);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
-/* Header for class bwapi4_Position */
-
-#ifndef _Included_bwapi4_Position
-#define _Included_bwapi4_Position
-#ifdef __cplusplus
-extern "C" {
-#endif
-/*
- * Class:     bwapi4_Position
- * Method:    isValid
- * Signature: ()Z
- */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Position_isValid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     bwapi4_Position
- * Method:    makeValid
- * Signature: ()Lbwapi4/Position;
- */
-JNIEXPORT jobject JNICALL Java_bwapi4_Position_makeValid
-  (JNIEnv *, jobject);
-
-/*
- * Class:     bwapi4_Position
- * Method:    getDistance
- * Signature: (Lbwapi4/Position;)D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Position_getDistance
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     bwapi4_Position
+ * Class:     bwapi_Position
  * Method:    getApproxDistance
- * Signature: (Lbwapi4/Position;)I
+ * Signature: (Lbwapi/Position;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Position_getApproxDistance
+JNIEXPORT jint JNICALL Java_bwapi_Position_getApproxDistance
   (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     bwapi4_Position
+ * Class:     bwapi_Position
  * Method:    getLength
  * Signature: ()D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Position_getLength
+JNIEXPORT jdouble JNICALL Java_bwapi_Position_getLength
   (JNIEnv *, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_PositionedObject */
+/* Header for class bwapi_PositionedObject */
 
-#ifndef _Included_bwapi4_PositionedObject
-#define _Included_bwapi4_PositionedObject
+#ifndef _Included_bwapi_PositionedObject
+#define _Included_bwapi_PositionedObject
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3019,10 +2922,10 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_PositionOrUnit */
+/* Header for class bwapi_PositionOrUnit */
 
-#ifndef _Included_bwapi4_PositionOrUnit
-#define _Included_bwapi4_PositionOrUnit
+#ifndef _Included_bwapi_PositionOrUnit
+#define _Included_bwapi_PositionOrUnit
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3030,353 +2933,345 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Race */
+/* Header for class bwapi_Race */
 
-#ifndef _Included_bwapi4_Race
-#define _Included_bwapi4_Race
+#ifndef _Included_bwapi_Race
+#define _Included_bwapi_Race
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Race
+ * Class:     bwapi_Race
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_Race_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_Race_toString_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Race
+ * Class:     bwapi_Race
  * Method:    getWorker_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getWorker_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getWorker_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Race
+ * Class:     bwapi_Race
  * Method:    getCenter_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getCenter_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getCenter_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Race
+ * Class:     bwapi_Race
  * Method:    getRefinery_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getRefinery_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getRefinery_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Race
+ * Class:     bwapi_Race
  * Method:    getTransport_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getTransport_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getTransport_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Race
+ * Class:     bwapi_Race
  * Method:    getSupplyProvider_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Race_getSupplyProvider_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getSupplyProvider_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Region */
+/* Header for class bwapi_Region */
 
-#ifndef _Included_bwapi4_Region
-#define _Included_bwapi4_Region
+#ifndef _Included_bwapi_Region
+#define _Included_bwapi_Region
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getID_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getID_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getID_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getRegionGroupID_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getRegionGroupID_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getRegionGroupID_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getCenter_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getCenter_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getCenter_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    isHigherGround_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Region_isHigherGround_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Region_isHigherGround_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getDefensePriority_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getDefensePriority_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getDefensePriority_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    isAccessible_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Region_isAccessible_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Region_isAccessible_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getNeighbors_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getNeighbors_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getNeighbors_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getBoundsLeft_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsLeft_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsLeft_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getBoundsTop_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsTop_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsTop_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getBoundsRight_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsRight_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsRight_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getBoundsBottom_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getBoundsBottom_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsBottom_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getClosestAccessibleRegion_native
- * Signature: (J)Lbwapi4/Region;
+ * Signature: (J)Lbwapi/Region;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getClosestAccessibleRegion_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getClosestAccessibleRegion_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getClosestInaccessibleRegion_native
- * Signature: (J)Lbwapi4/Region;
+ * Signature: (J)Lbwapi/Region;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Region_getClosestInaccessibleRegion_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getClosestInaccessibleRegion_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Region
+ * Class:     bwapi_Region
  * Method:    getDistance_native
- * Signature: (JLbwapi4/Region;)I
+ * Signature: (JLbwapi/Region;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Region_getDistance_1native
+JNIEXPORT jint JNICALL Java_bwapi_Region_getDistance_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Regionset */
+/* Header for class bwapi_Regionset */
 
-#ifndef _Included_bwapi4_Regionset
-#define _Included_bwapi4_Regionset
+#ifndef _Included_bwapi_Regionset
+#define _Included_bwapi_Regionset
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Regionset
+ * Class:     bwapi_Regionset
  * Method:    getCenter_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Regionset_getCenter_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Regionset_getCenter_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_TechType */
+/* Header for class bwapi_TechType */
 
-#ifndef _Included_bwapi4_TechType
-#define _Included_bwapi4_TechType
+#ifndef _Included_bwapi_TechType
+#define _Included_bwapi_TechType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_TechType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_TechType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    getRace_native
- * Signature: (J)Lbwapi4/Race;
+ * Signature: (J)Lbwapi/Race;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_getRace_1native
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getRace_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    mineralPrice_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_mineralPrice_1native
+JNIEXPORT jint JNICALL Java_bwapi_TechType_mineralPrice_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    gasPrice_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_gasPrice_1native
+JNIEXPORT jint JNICALL Java_bwapi_TechType_gasPrice_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    researchTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_researchTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_TechType_researchTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    energyCost_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_TechType_energyCost_1native
+JNIEXPORT jint JNICALL Java_bwapi_TechType_energyCost_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    whatResearches_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_whatResearches_1native
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_whatResearches_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    getWeapon_native
- * Signature: (J)Lbwapi4/WeaponType;
+ * Signature: (J)Lbwapi/WeaponType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_getWeapon_1native
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getWeapon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    targetsUnit_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_TechType_targetsUnit_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_TechType_targetsUnit_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    targetsPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_TechType_targetsPosition_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_TechType_targetsPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_TechType
+ * Class:     bwapi_TechType
  * Method:    getOrder_native
- * Signature: (J)Lbwapi4/Order;
+ * Signature: (J)Lbwapi/Order;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_TechType_getOrder_1native
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getOrder_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_TilePosition */
+/* Header for class bwapi_TilePosition */
 
-#ifndef _Included_bwapi4_TilePosition
-#define _Included_bwapi4_TilePosition
+#ifndef _Included_bwapi_TilePosition
+#define _Included_bwapi_TilePosition
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_TilePosition
+ * Class:     bwapi_TilePosition
  * Method:    isValid
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_TilePosition_isValid
+JNIEXPORT jboolean JNICALL Java_bwapi_TilePosition_isValid
   (JNIEnv *, jobject);
 
 /*
- * Class:     bwapi4_TilePosition
+ * Class:     bwapi_TilePosition
  * Method:    makeValid
- * Signature: ()Lbwapi4/TilePosition;
+ * Signature: ()Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_TilePosition_makeValid
+JNIEXPORT jobject JNICALL Java_bwapi_TilePosition_makeValid
   (JNIEnv *, jobject);
 
 /*
- * Class:     bwapi4_TilePosition
- * Method:    getDistance
- * Signature: (Lbwapi4/TilePosition;)D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_TilePosition_getDistance
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     bwapi4_TilePosition
+ * Class:     bwapi_TilePosition
  * Method:    getLength
  * Signature: ()D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_TilePosition_getLength
+JNIEXPORT jdouble JNICALL Java_bwapi_TilePosition_getLength
   (JNIEnv *, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_UnaryFilter */
+/* Header for class bwapi_UnaryFilter */
 
-#ifndef _Included_bwapi4_UnaryFilter
-#define _Included_bwapi4_UnaryFilter
+#ifndef _Included_bwapi_UnaryFilter
+#define _Included_bwapi_UnaryFilter
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3384,4107 +3279,4107 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Unit */
+/* Header for class bwapi_Unit */
 
-#ifndef _Included_bwapi4_Unit
-#define _Included_bwapi4_Unit
+#ifndef _Included_bwapi_Unit
+#define _Included_bwapi_Unit
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getID_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getID_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getID_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    exists_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_exists_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_exists_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getReplayID_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getReplayID_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getReplayID_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getPlayer_native
- * Signature: (J)Lbwapi4/Player;
+ * Signature: (J)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getPlayer_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPlayer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getType_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getTilePosition_native
- * Signature: (J)Lbwapi4/TilePosition;
+ * Signature: (J)Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTilePosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTilePosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getAngle_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Unit_getAngle_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getAngle_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getVelocityX_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Unit_getVelocityX_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getVelocityX_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getVelocityY_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Unit_getVelocityY_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getVelocityY_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRegion_native
- * Signature: (J)Lbwapi4/Region;
+ * Signature: (J)Lbwapi/Region;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getRegion_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRegion_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getLeft_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getLeft_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLeft_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getTop_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getTop_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getTop_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRight_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRight_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRight_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getBottom_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getBottom_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getBottom_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getHitPoints_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getHitPoints_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getHitPoints_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getShields_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getShields_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getShields_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getEnergy_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getEnergy_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getEnergy_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getResources_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getResources_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getResources_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getResourceGroup_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getResourceGroup_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getResourceGroup_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getDistance_native
- * Signature: (JLbwapi4/PositionOrUnit;)I
+ * Signature: (JLbwapi/PositionOrUnit;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getDistance_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDistance_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    hasPath_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_hasPath_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_hasPath_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getLastCommandFrame_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getLastCommandFrame_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLastCommandFrame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getLastCommand_native
- * Signature: (J)Lbwapi4/UnitCommand;
+ * Signature: (J)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLastCommand_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLastCommand_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getLastAttackingPlayer_native
- * Signature: (J)Lbwapi4/Player;
+ * Signature: (J)Lbwapi/Player;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLastAttackingPlayer_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLastAttackingPlayer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getInitialType_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInitialType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getInitialPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInitialPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getInitialTilePosition_native
- * Signature: (J)Lbwapi4/TilePosition;
+ * Signature: (J)Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInitialTilePosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialTilePosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getInitialHitPoints_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getInitialHitPoints_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInitialHitPoints_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getInitialResources_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getInitialResources_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInitialResources_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getKillCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getKillCount_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getKillCount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getAcidSporeCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getAcidSporeCount_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getAcidSporeCount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getInterceptorCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getInterceptorCount_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInterceptorCount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getScarabCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getScarabCount_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getScarabCount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getSpiderMineCount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getSpiderMineCount_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpiderMineCount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getGroundWeaponCooldown_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getGroundWeaponCooldown_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getGroundWeaponCooldown_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getAirWeaponCooldown_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getAirWeaponCooldown_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getAirWeaponCooldown_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getSpellCooldown_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getSpellCooldown_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpellCooldown_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getDefenseMatrixPoints_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getDefenseMatrixPoints_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDefenseMatrixPoints_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getDefenseMatrixTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getDefenseMatrixTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDefenseMatrixTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getEnsnareTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getEnsnareTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getEnsnareTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getIrradiateTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getIrradiateTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getIrradiateTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getLockdownTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getLockdownTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLockdownTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getMaelstromTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getMaelstromTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getMaelstromTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getOrderTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getOrderTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getOrderTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getPlagueTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getPlagueTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getPlagueTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRemoveTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemoveTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemoveTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getStasisTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getStasisTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getStasisTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getStimTimer_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getStimTimer_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getStimTimer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getBuildType_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getBuildType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getBuildType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getTech_native
- * Signature: (J)Lbwapi4/TechType;
+ * Signature: (J)Lbwapi/TechType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTech_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTech_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getUpgrade_native
- * Signature: (J)Lbwapi4/UpgradeType;
+ * Signature: (J)Lbwapi/UpgradeType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getUpgrade_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getUpgrade_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRemainingBuildTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingBuildTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingBuildTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRemainingTrainTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingTrainTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingTrainTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRemainingResearchTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingResearchTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingResearchTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRemainingUpgradeTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getRemainingUpgradeTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingUpgradeTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getBuildUnit_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getBuildUnit_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getBuildUnit_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getTarget_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTarget_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTarget_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getTargetPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTargetPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTargetPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getOrder_native
- * Signature: (J)Lbwapi4/Order;
+ * Signature: (J)Lbwapi/Order;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getOrder_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrder_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getSecondaryOrder_native
- * Signature: (J)Lbwapi4/Order;
+ * Signature: (J)Lbwapi/Order;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getSecondaryOrder_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getSecondaryOrder_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getOrderTarget_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getOrderTarget_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrderTarget_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getOrderTargetPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getOrderTargetPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrderTargetPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRallyPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getRallyPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRallyPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getRallyUnit_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getRallyUnit_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRallyUnit_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getAddon_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getAddon_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getAddon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getNydusExit_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getNydusExit_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getNydusExit_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getPowerUp_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getPowerUp_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPowerUp_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getTransport_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getTransport_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTransport_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getLoadedUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLoadedUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLoadedUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getSpaceRemaining_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_Unit_getSpaceRemaining_1native
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpaceRemaining_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getCarrier_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getCarrier_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getCarrier_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getInterceptors_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getInterceptors_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInterceptors_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getHatchery_native
- * Signature: (J)Lbwapi4/Unit;
+ * Signature: (J)Lbwapi/Unit;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getHatchery_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getHatchery_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    getLarva_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unit_getLarva_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLarva_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    hasNuke_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_hasNuke_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_hasNuke_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isAccelerating_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isAccelerating_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAccelerating_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isAttacking_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isAttacking_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAttacking_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isAttackFrame_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isAttackFrame_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAttackFrame_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isBeingConstructed_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBeingConstructed_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingConstructed_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isBeingGathered_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBeingGathered_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingGathered_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isBeingHealed_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBeingHealed_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingHealed_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isBlind_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBlind_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBlind_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isBraking_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBraking_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBraking_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isBurrowed_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isBurrowed_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBurrowed_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isCarryingGas_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCarryingGas_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCarryingGas_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isCarryingMinerals_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCarryingMinerals_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCarryingMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isCloaked_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCloaked_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCloaked_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isCompleted_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isCompleted_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCompleted_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isConstructing_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isConstructing_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isConstructing_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isDefenseMatrixed_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isDefenseMatrixed_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isDefenseMatrixed_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isDetected_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isDetected_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isDetected_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isEnsnared_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isEnsnared_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isEnsnared_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isFlying_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isFlying_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isFlying_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isFollowing_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isFollowing_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isFollowing_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isGatheringGas_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isGatheringGas_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isGatheringGas_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isGatheringMinerals_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isGatheringMinerals_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isGatheringMinerals_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isHallucination_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isHallucination_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isHallucination_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isHoldingPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isHoldingPosition_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isHoldingPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isIdle_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isIdle_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isIdle_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isInterruptible_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isInterruptible_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInterruptible_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isInvincible_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isInvincible_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInvincible_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isInWeaponRange_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isInWeaponRange_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInWeaponRange_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isIrradiated_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isIrradiated_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isIrradiated_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isLifted_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isLifted_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLifted_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isLoaded_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isLoaded_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLoaded_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isLockedDown_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isLockedDown_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLockedDown_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isMaelstrommed_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isMaelstrommed_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMaelstrommed_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isMorphing_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isMorphing_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMorphing_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isMoving_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isMoving_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMoving_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isParasited_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isParasited_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isParasited_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isPatrolling_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isPatrolling_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPatrolling_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isPlagued_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isPlagued_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPlagued_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isRepairing_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isRepairing_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isRepairing_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isResearching_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isResearching_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isResearching_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isSelected_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isSelected_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isSelected_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isSieged_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isSieged_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isSieged_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isStartingAttack_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStartingAttack_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStartingAttack_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isStasised_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStasised_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStasised_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isStimmed_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStimmed_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStimmed_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isStuck_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isStuck_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStuck_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isTraining_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isTraining_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isTraining_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isUnderAttack_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderAttack_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderAttack_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isUnderDarkSwarm_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderDarkSwarm_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderDarkSwarm_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isUnderDisruptionWeb_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderDisruptionWeb_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderDisruptionWeb_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isUnderStorm_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUnderStorm_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderStorm_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isPowered_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isPowered_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPowered_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isUpgrading_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isUpgrading_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUpgrading_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isVisible_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isVisible_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isVisible_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isVisible_native
- * Signature: (JLbwapi4/Player;)Z
+ * Signature: (JLbwapi/Player;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isVisible_1native__JLbwapi4_Player_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isVisible_1native__JLbwapi_Player_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    isTargetable_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_isTargetable_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isTargetable_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    issueCommand_native
- * Signature: (JLbwapi4/UnitCommand;)Z
+ * Signature: (JLbwapi/UnitCommand;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_issueCommand_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_issueCommand_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    attack_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_attack_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_attack_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    attack_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_attack_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_attack_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    build_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_build_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_build_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    build_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_build_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_build_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    buildAddon_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_buildAddon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_buildAddon_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    train_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_train_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_train_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    train_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_train_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_train_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    morph_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_morph_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_morph_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    research_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_research_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_research_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    upgrade_native
- * Signature: (JLbwapi4/UpgradeType;)Z
+ * Signature: (JLbwapi/UpgradeType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_upgrade_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_upgrade_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    setRallyPoint_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_setRallyPoint_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_setRallyPoint_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    move_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_move_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_move_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    move_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_move_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_move_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    patrol_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_patrol_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_patrol_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    patrol_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_patrol_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_patrol_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    holdPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_holdPosition_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_holdPosition_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    holdPosition_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_holdPosition_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_holdPosition_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    stop_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_stop_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_stop_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    stop_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_stop_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_stop_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    follow_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_follow_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_follow_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    follow_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_follow_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_follow_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    gather_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_gather_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_gather_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    gather_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_gather_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_gather_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    returnCargo_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_returnCargo_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_returnCargo_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    returnCargo_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_returnCargo_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_returnCargo_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    repair_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_repair_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_repair_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    repair_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_repair_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_repair_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    burrow_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_burrow_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_burrow_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    unburrow_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unburrow_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unburrow_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cloak_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cloak_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cloak_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    decloak_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_decloak_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_decloak_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    siege_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_siege_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_siege_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    unsiege_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unsiege_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unsiege_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    lift_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_lift_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_lift_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    land_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_land_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_land_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    load_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_load_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_load_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    load_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_load_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_load_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    unload_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unload_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unload_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    unloadAll_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    unloadAll_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    unloadAll_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    unloadAll_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_unloadAll_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    rightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_rightClick_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_rightClick_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    rightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_rightClick_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_rightClick_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    haltConstruction_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_haltConstruction_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_haltConstruction_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cancelConstruction_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelConstruction_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelConstruction_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cancelAddon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelAddon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelAddon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cancelTrain_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelTrain_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelTrain_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cancelTrain_native
  * Signature: (JI)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelTrain_1native__JI
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelTrain_1native__JI
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cancelMorph_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelMorph_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelMorph_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cancelResearch_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelResearch_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelResearch_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    cancelUpgrade_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_cancelUpgrade_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelUpgrade_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    useTech_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_useTech_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_useTech_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    useTech_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_useTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_useTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    placeCOP_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_placeCOP_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_placeCOP_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommand_native
- * Signature: (JLbwapi4/UnitCommand;ZZZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommand_native
- * Signature: (JLbwapi4/UnitCommand;ZZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommand_native
- * Signature: (JLbwapi4/UnitCommand;ZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommand_native
- * Signature: (JLbwapi4/UnitCommand;ZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommand_native
- * Signature: (JLbwapi4/UnitCommand;Z)Z
+ * Signature: (JLbwapi/UnitCommand;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommand_native
- * Signature: (JLbwapi4/UnitCommand;)Z
+ * Signature: (JLbwapi/UnitCommand;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommand_native
- * Signature: (JLbwapi4/UnitCommand;ZZZZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommand_1native__JLbwapi4_UnitCommand_2ZZZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandGrouped_native
- * Signature: (JLbwapi4/UnitCommand;ZZZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandGrouped_native
- * Signature: (JLbwapi4/UnitCommand;ZZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandGrouped_native
- * Signature: (JLbwapi4/UnitCommand;ZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandGrouped_native
- * Signature: (JLbwapi4/UnitCommand;ZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandGrouped_native
- * Signature: (JLbwapi4/UnitCommand;Z)Z
+ * Signature: (JLbwapi/UnitCommand;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandGrouped_native
- * Signature: (JLbwapi4/UnitCommand;)Z
+ * Signature: (JLbwapi/UnitCommand;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandGrouped_native
- * Signature: (JLbwapi4/UnitCommand;ZZZZZZ)Z
+ * Signature: (JLbwapi/UnitCommand;ZZZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandGrouped_1native__JLbwapi4_UnitCommand_2ZZZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCommand_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCommand_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommand_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCommandGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCommandGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommandGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCommandGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCommandGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommandGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandType_native
- * Signature: (JLbwapi4/UnitCommandType;)Z
+ * Signature: (JLbwapi/UnitCommandType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandType_1native__JLbwapi4_UnitCommandType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandType_1native__JLbwapi_UnitCommandType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandType_native
- * Signature: (JLbwapi4/UnitCommandType;Z)Z
+ * Signature: (JLbwapi/UnitCommandType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandType_1native__JLbwapi4_UnitCommandType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandType_1native__JLbwapi_UnitCommandType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandTypeGrouped_native
- * Signature: (JLbwapi4/UnitCommandType;Z)Z
+ * Signature: (JLbwapi/UnitCommandType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandTypeGrouped_1native__JLbwapi4_UnitCommandType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandTypeGrouped_native
- * Signature: (JLbwapi4/UnitCommandType;)Z
+ * Signature: (JLbwapi/UnitCommandType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandTypeGrouped_1native__JLbwapi4_UnitCommandType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canIssueCommandTypeGrouped_native
- * Signature: (JLbwapi4/UnitCommandType;ZZ)Z
+ * Signature: (JLbwapi/UnitCommandType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canIssueCommandTypeGrouped_1native__JLbwapi4_UnitCommandType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canTargetUnit_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTargetUnit_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTargetUnit_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canTargetUnit_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTargetUnit_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTargetUnit_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttack_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttack_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttack_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttack_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttack_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttack_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttack_1native__JLbwapi4_PositionOrUnit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackMove_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMove_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMove_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackMove_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMove_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMove_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackMoveGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMoveGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackMoveGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMoveGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackMoveGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackMoveGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnit_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnit_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnit_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnit_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnit_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnit_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnit_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canAttackUnitGrouped_native
- * Signature: (JLbwapi4/Unit;ZZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canAttackUnitGrouped_1native__JLbwapi4_Unit_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
- * Signature: (JLbwapi4/UnitType;Z)Z
+ * Signature: (JLbwapi/UnitType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
- * Signature: (JLbwapi4/UnitType;ZZ)Z
+ * Signature: (JLbwapi/UnitType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;ZZ)Z
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;Z)Z
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuild_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;ZZZ)Z
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuild_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuildAddon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuildAddon_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuildAddon_native
- * Signature: (JLbwapi4/UnitType;Z)Z
+ * Signature: (JLbwapi/UnitType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JLbwapi4_UnitType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuildAddon_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBuildAddon_native
- * Signature: (JLbwapi4/UnitType;ZZ)Z
+ * Signature: (JLbwapi/UnitType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBuildAddon_1native__JLbwapi4_UnitType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canTrain_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canTrain_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canTrain_native
- * Signature: (JLbwapi4/UnitType;Z)Z
+ * Signature: (JLbwapi/UnitType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JLbwapi4_UnitType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canTrain_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canTrain_native
- * Signature: (JLbwapi4/UnitType;ZZ)Z
+ * Signature: (JLbwapi/UnitType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canTrain_1native__JLbwapi4_UnitType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMorph_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMorph_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMorph_native
- * Signature: (JLbwapi4/UnitType;Z)Z
+ * Signature: (JLbwapi/UnitType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JLbwapi4_UnitType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMorph_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMorph_native
- * Signature: (JLbwapi4/UnitType;ZZ)Z
+ * Signature: (JLbwapi/UnitType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMorph_1native__JLbwapi4_UnitType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canResearch_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canResearch_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canResearch_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canResearch_native
- * Signature: (JLbwapi4/TechType;Z)Z
+ * Signature: (JLbwapi/TechType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canResearch_1native__JLbwapi4_TechType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JLbwapi_TechType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUpgrade_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUpgrade_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUpgrade_native
- * Signature: (JLbwapi4/UpgradeType;)Z
+ * Signature: (JLbwapi/UpgradeType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__JLbwapi4_UpgradeType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JLbwapi_UpgradeType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUpgrade_native
- * Signature: (JLbwapi4/UpgradeType;Z)Z
+ * Signature: (JLbwapi/UpgradeType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUpgrade_1native__JLbwapi4_UpgradeType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JLbwapi_UpgradeType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPoint_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPoint_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPoint_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPoint_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPoint_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPoint_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPoint_1native__JLbwapi4_PositionOrUnit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPosition_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPosition_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyPosition_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyPosition_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPosition_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyUnit_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyUnit_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyUnit_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyUnit_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyUnit_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSetRallyUnit_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSetRallyUnit_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMove_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMove_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMove_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMove_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMove_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMove_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMoveGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMoveGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMoveGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMoveGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canMoveGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canMoveGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPatrol_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrol_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrol_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPatrol_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrol_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrol_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPatrolGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrolGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPatrolGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrolGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPatrolGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPatrolGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canFollow_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canFollow_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canFollow_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canFollow_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canFollow_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canFollow_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canFollow_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canGather_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canGather_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canGather_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canGather_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canGather_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canGather_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canGather_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canReturnCargo_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canReturnCargo_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canReturnCargo_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canReturnCargo_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canReturnCargo_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canReturnCargo_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canHoldPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHoldPosition_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHoldPosition_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canHoldPosition_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHoldPosition_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHoldPosition_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canStop_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canStop_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canStop_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canStop_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canStop_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canStop_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRepair_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRepair_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRepair_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRepair_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRepair_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRepair_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRepair_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBurrow_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBurrow_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBurrow_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canBurrow_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canBurrow_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBurrow_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnburrow_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnburrow_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnburrow_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnburrow_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnburrow_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnburrow_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCloak_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCloak_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCloak_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCloak_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCloak_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCloak_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canDecloak_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canDecloak_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canDecloak_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canDecloak_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canDecloak_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canDecloak_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSiege_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSiege_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSiege_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canSiege_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canSiege_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSiege_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnsiege_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnsiege_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnsiege_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnsiege_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnsiege_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnsiege_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLift_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLift_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLift_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLift_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLift_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLift_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLand_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLand_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLand_native
- * Signature: (JLbwapi4/TilePosition;Z)Z
+ * Signature: (JLbwapi/TilePosition;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JLbwapi4_TilePosition_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLand_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLand_native
- * Signature: (JLbwapi4/TilePosition;ZZ)Z
+ * Signature: (JLbwapi/TilePosition;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLand_1native__JLbwapi4_TilePosition_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLoad_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLoad_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLoad_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLoad_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLoad_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canLoad_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canLoad_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadWithOrWithoutTarget_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadWithOrWithoutTarget_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadWithOrWithoutTarget_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadWithOrWithoutTarget_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadWithOrWithoutTarget_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadWithOrWithoutTarget_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAtPosition_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAtPosition_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAtPosition_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAtPosition_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAtPosition_native
- * Signature: (JLbwapi4/Position;ZZ)Z
+ * Signature: (JLbwapi/Position;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAtPosition_1native__JLbwapi4_Position_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnload_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnload_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnload_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnload_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnload_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnload_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnload_native
- * Signature: (JLbwapi4/Unit;ZZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnload_1native__JLbwapi4_Unit_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAll_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAll_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAll_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAll_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAll_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAll_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAllPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAllPosition_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAllPosition_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAllPosition_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUnloadAllPosition_native
- * Signature: (JLbwapi4/Position;ZZ)Z
+ * Signature: (JLbwapi/Position;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUnloadAllPosition_1native__JLbwapi4_Position_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClick_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClick_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClick_1native__JLbwapi4_PositionOrUnit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickGrouped_native
- * Signature: (JLbwapi4/PositionOrUnit;ZZZZ)Z
+ * Signature: (JLbwapi/PositionOrUnit;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickGrouped_1native__JLbwapi4_PositionOrUnit_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPosition_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPosition_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickPosition_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPosition_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPosition_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickPositionGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPositionGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickPositionGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPositionGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickPositionGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickPositionGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnit_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnit_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnit_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnit_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnit_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnit_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnit_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
  * Signature: (JZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JZZ
   (JNIEnv *, jobject, jlong, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
- * Signature: (JLbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
- * Signature: (JLbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canRightClickUnitGrouped_native
- * Signature: (JLbwapi4/Unit;ZZZZ)Z
+ * Signature: (JLbwapi/Unit;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canRightClickUnitGrouped_1native__JLbwapi4_Unit_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canHaltConstruction_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHaltConstruction_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHaltConstruction_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canHaltConstruction_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canHaltConstruction_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHaltConstruction_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelConstruction_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelConstruction_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelConstruction_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelConstruction_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelConstruction_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelConstruction_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelAddon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelAddon_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelAddon_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelAddon_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelAddon_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelAddon_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelTrain_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrain_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrain_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelTrain_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrain_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrain_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelTrainSlot_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelTrainSlot_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelTrainSlot_native
  * Signature: (JIZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JIZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JIZ
   (JNIEnv *, jobject, jlong, jint, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelTrainSlot_native
  * Signature: (JI)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JI
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JI
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelTrainSlot_native
  * Signature: (JIZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelTrainSlot_1native__JIZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JIZZ
   (JNIEnv *, jobject, jlong, jint, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelMorph_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelMorph_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelMorph_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelMorph_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelMorph_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelMorph_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelResearch_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelResearch_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelResearch_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelResearch_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelResearch_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelResearch_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelUpgrade_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelUpgrade_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelUpgrade_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canCancelUpgrade_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canCancelUpgrade_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelUpgrade_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithOrWithoutTarget_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithOrWithoutTarget_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithOrWithoutTarget_native
- * Signature: (JLbwapi4/TechType;Z)Z
+ * Signature: (JLbwapi/TechType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi4_TechType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithOrWithoutTarget_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithOrWithoutTarget_native
- * Signature: (JLbwapi4/TechType;ZZ)Z
+ * Signature: (JLbwapi/TechType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi4_TechType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTech_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/PositionOrUnit;ZZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTech_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/PositionOrUnit;ZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTech_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTech_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTech_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTech_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/PositionOrUnit;ZZZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithoutTarget_native
- * Signature: (JLbwapi4/TechType;Z)Z
+ * Signature: (JLbwapi/TechType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithoutTarget_1native__JLbwapi4_TechType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithoutTarget_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithoutTarget_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechWithoutTarget_native
- * Signature: (JLbwapi4/TechType;ZZ)Z
+ * Signature: (JLbwapi/TechType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechWithoutTarget_1native__JLbwapi4_TechType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;Z)Z
+ * Signature: (JLbwapi/TechType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;ZZ)Z
+ * Signature: (JLbwapi/TechType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Unit;ZZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Unit;ZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Unit;)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechUnit_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Unit;ZZZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;ZZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechUnit_1native__JLbwapi4_TechType_2Lbwapi4_Unit_2ZZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechPosition_native
- * Signature: (JLbwapi4/TechType;Z)Z
+ * Signature: (JLbwapi/TechType;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechPosition_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechPosition_native
- * Signature: (JLbwapi4/TechType;ZZ)Z
+ * Signature: (JLbwapi/TechType;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechPosition_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Position;ZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechPosition_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechPosition_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Position;)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canUseTechPosition_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/Position;ZZZ)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;ZZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canUseTechPosition_1native__JLbwapi4_TechType_2Lbwapi4_Position_2ZZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2ZZZ
   (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPlaceCOP_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPlaceCOP_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPlaceCOP_native
- * Signature: (JLbwapi4/TilePosition;Z)Z
+ * Signature: (JLbwapi/TilePosition;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JLbwapi4_TilePosition_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPlaceCOP_native
- * Signature: (JLbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JLbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unit
+ * Class:     bwapi_Unit
  * Method:    canPlaceCOP_native
- * Signature: (JLbwapi4/TilePosition;ZZ)Z
+ * Signature: (JLbwapi/TilePosition;ZZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unit_canPlaceCOP_1native__JLbwapi4_TilePosition_2ZZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2ZZ
   (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_UnitCommand */
+/* Header for class bwapi_UnitCommand */
 
-#ifndef _Included_bwapi4_UnitCommand
-#define _Included_bwapi4_UnitCommand
+#ifndef _Included_bwapi_UnitCommand
+#define _Included_bwapi_UnitCommand
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    attack
- * Signature: (Lbwapi4/Unit;Lbwapi4/PositionOrUnit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_attack__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_attack__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    attack
- * Signature: (Lbwapi4/Unit;Lbwapi4/PositionOrUnit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_attack__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_attack__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    build
- * Signature: (Lbwapi4/Unit;Lbwapi4/TilePosition;Lbwapi4/UnitType;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/TilePosition;Lbwapi/UnitType;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_build
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_build
   (JNIEnv *, jclass, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    buildAddon
- * Signature: (Lbwapi4/Unit;Lbwapi4/UnitType;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/UnitType;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_buildAddon
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_buildAddon
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    train
- * Signature: (Lbwapi4/Unit;Lbwapi4/UnitType;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/UnitType;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_train
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_train
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    morph
- * Signature: (Lbwapi4/Unit;Lbwapi4/UnitType;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/UnitType;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_morph
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_morph
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    research
- * Signature: (Lbwapi4/Unit;Lbwapi4/TechType;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/TechType;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_research
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_research
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    upgrade
- * Signature: (Lbwapi4/Unit;Lbwapi4/UpgradeType;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/UpgradeType;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_upgrade
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_upgrade
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    setRallyPoint
- * Signature: (Lbwapi4/Unit;Lbwapi4/PositionOrUnit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_setRallyPoint
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_setRallyPoint
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    move
- * Signature: (Lbwapi4/Unit;Lbwapi4/Position;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_move__Lbwapi4_Unit_2Lbwapi4_Position_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_move__Lbwapi_Unit_2Lbwapi_Position_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    move
- * Signature: (Lbwapi4/Unit;Lbwapi4/Position;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_move__Lbwapi4_Unit_2Lbwapi4_Position_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_move__Lbwapi_Unit_2Lbwapi_Position_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    patrol
- * Signature: (Lbwapi4/Unit;Lbwapi4/Position;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_patrol__Lbwapi4_Unit_2Lbwapi4_Position_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_patrol__Lbwapi_Unit_2Lbwapi_Position_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    patrol
- * Signature: (Lbwapi4/Unit;Lbwapi4/Position;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_patrol__Lbwapi4_Unit_2Lbwapi4_Position_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_patrol__Lbwapi_Unit_2Lbwapi_Position_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    holdPosition
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_holdPosition__Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_holdPosition__Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    holdPosition
- * Signature: (Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_holdPosition__Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_holdPosition__Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    stop
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_stop__Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_stop__Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    stop
- * Signature: (Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_stop__Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_stop__Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    follow
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_follow__Lbwapi4_Unit_2Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_follow__Lbwapi_Unit_2Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    follow
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_follow__Lbwapi4_Unit_2Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_follow__Lbwapi_Unit_2Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    gather
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_gather__Lbwapi4_Unit_2Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_gather__Lbwapi_Unit_2Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    gather
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_gather__Lbwapi4_Unit_2Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_gather__Lbwapi_Unit_2Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    returnCargo
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_returnCargo__Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_returnCargo__Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    returnCargo
- * Signature: (Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_returnCargo__Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_returnCargo__Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    repair
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_repair__Lbwapi4_Unit_2Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_repair__Lbwapi_Unit_2Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    repair
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_repair__Lbwapi4_Unit_2Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_repair__Lbwapi_Unit_2Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    burrow
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_burrow
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_burrow
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    unburrow
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unburrow
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unburrow
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cloak
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cloak
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cloak
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    decloak
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_decloak
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_decloak
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    siege
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_siege
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_siege
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    unsiege
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unsiege
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unsiege
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    lift
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_lift
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_lift
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    land
- * Signature: (Lbwapi4/Unit;Lbwapi4/TilePosition;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/TilePosition;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_land
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_land
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    load
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_load__Lbwapi4_Unit_2Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_load__Lbwapi_Unit_2Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    load
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_load__Lbwapi4_Unit_2Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_load__Lbwapi_Unit_2Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    unload
- * Signature: (Lbwapi4/Unit;Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unload
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unload
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    unloadAll
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    unloadAll
- * Signature: (Lbwapi4/Unit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Z
   (JNIEnv *, jclass, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    unloadAll
- * Signature: (Lbwapi4/Unit;Lbwapi4/Position;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2Lbwapi4_Position_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Lbwapi_Position_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    unloadAll
- * Signature: (Lbwapi4/Unit;Lbwapi4/Position;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_unloadAll__Lbwapi4_Unit_2Lbwapi4_Position_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Lbwapi_Position_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    rightClick
- * Signature: (Lbwapi4/Unit;Lbwapi4/PositionOrUnit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_rightClick__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_rightClick__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    rightClick
- * Signature: (Lbwapi4/Unit;Lbwapi4/PositionOrUnit;Z)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;Z)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_rightClick__Lbwapi4_Unit_2Lbwapi4_PositionOrUnit_2Z
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_rightClick__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2Z
   (JNIEnv *, jclass, jobject, jobject, jboolean);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    haltConstruction
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_haltConstruction
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_haltConstruction
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cancelConstruction
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelConstruction
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelConstruction
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cancelAddon
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelAddon
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelAddon
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cancelTrain
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelTrain__Lbwapi4_Unit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelTrain__Lbwapi_Unit_2
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cancelTrain
- * Signature: (Lbwapi4/Unit;I)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;I)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelTrain__Lbwapi4_Unit_2I
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelTrain__Lbwapi_Unit_2I
   (JNIEnv *, jclass, jobject, jint);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cancelMorph
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelMorph
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelMorph
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cancelResearch
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelResearch
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelResearch
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    cancelUpgrade
- * Signature: (Lbwapi4/Unit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_cancelUpgrade
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelUpgrade
   (JNIEnv *, jclass, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    useTech
- * Signature: (Lbwapi4/Unit;Lbwapi4/TechType;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/TechType;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_useTech__Lbwapi4_Unit_2Lbwapi4_TechType_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_useTech__Lbwapi_Unit_2Lbwapi_TechType_2
   (JNIEnv *, jclass, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    useTech
- * Signature: (Lbwapi4/Unit;Lbwapi4/TechType;Lbwapi4/PositionOrUnit;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/TechType;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_useTech__Lbwapi4_Unit_2Lbwapi4_TechType_2Lbwapi4_PositionOrUnit_2
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_useTech__Lbwapi_Unit_2Lbwapi_TechType_2Lbwapi_PositionOrUnit_2
   (JNIEnv *, jclass, jobject, jobject, jobject);
 
 /*
- * Class:     bwapi4_UnitCommand
+ * Class:     bwapi_UnitCommand
  * Method:    placeCOP
- * Signature: (Lbwapi4/Unit;Lbwapi4/TilePosition;)Lbwapi4/UnitCommand;
+ * Signature: (Lbwapi/Unit;Lbwapi/TilePosition;)Lbwapi/UnitCommand;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitCommand_placeCOP
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_placeCOP
   (JNIEnv *, jclass, jobject, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_UnitCommandType */
+/* Header for class bwapi_UnitCommandType */
 
-#ifndef _Included_bwapi4_UnitCommandType
-#define _Included_bwapi4_UnitCommandType
+#ifndef _Included_bwapi_UnitCommandType
+#define _Included_bwapi_UnitCommandType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_UnitCommandType
+ * Class:     bwapi_UnitCommandType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_UnitCommandType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_UnitCommandType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_UnitFilter */
+/* Header for class bwapi_UnitFilter */
 
-#ifndef _Included_bwapi4_UnitFilter
-#define _Included_bwapi4_UnitFilter
+#ifndef _Included_bwapi_UnitFilter
+#define _Included_bwapi_UnitFilter
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -7492,1515 +7387,1507 @@ extern "C" {
 }
 #endif
 #endif
-/* Header for class bwapi4_Unitset */
+/* Header for class bwapi_Unitset */
 
-#ifndef _Included_bwapi4_Unitset
-#define _Included_bwapi4_Unitset
+#ifndef _Included_bwapi_Unitset
+#define _Included_bwapi_Unitset
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    getPosition_native
- * Signature: (J)Lbwapi4/Position;
+ * Signature: (J)Lbwapi/Position;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getPosition_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getPosition_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    getLoadedUnits_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getLoadedUnits_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getLoadedUnits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    getInterceptors_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getInterceptors_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getInterceptors_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    getLarva_native
  * Signature: (J)Ljava/util/List;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_Unitset_getLarva_1native
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getLarva_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    issueCommand_native
- * Signature: (JLbwapi4/UnitCommand;)Z
+ * Signature: (JLbwapi/UnitCommand;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_issueCommand_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_issueCommand_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    attack_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_attack_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_attack_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    attack_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_attack_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_attack_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    build_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_build_1native__JLbwapi4_UnitType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_build_1native__JLbwapi_UnitType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    build_native
- * Signature: (JLbwapi4/UnitType;Lbwapi4/TilePosition;)Z
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_build_1native__JLbwapi4_UnitType_2Lbwapi4_TilePosition_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_build_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    buildAddon_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_buildAddon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_buildAddon_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    train_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_train_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_train_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    morph_native
- * Signature: (JLbwapi4/UnitType;)Z
+ * Signature: (JLbwapi/UnitType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_morph_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_morph_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    setRallyPoint_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_setRallyPoint_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_setRallyPoint_1native
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    move_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_move_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_move_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    move_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_move_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_move_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    patrol_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_patrol_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_patrol_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    patrol_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_patrol_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_patrol_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    holdPosition_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_holdPosition_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_holdPosition_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    holdPosition_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_holdPosition_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_holdPosition_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    stop_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_stop_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_stop_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    stop_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_stop_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_stop_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    follow_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_follow_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_follow_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    follow_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_follow_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_follow_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    gather_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_gather_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_gather_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    gather_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_gather_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_gather_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    returnCargo_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_returnCargo_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_returnCargo_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    returnCargo_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_returnCargo_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_returnCargo_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    repair_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_repair_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_repair_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    repair_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_repair_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_repair_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    burrow_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_burrow_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_burrow_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    unburrow_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unburrow_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unburrow_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cloak_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cloak_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cloak_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    decloak_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_decloak_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_decloak_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    siege_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_siege_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_siege_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    unsiege_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unsiege_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unsiege_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    lift_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_lift_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_lift_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    load_native
- * Signature: (JLbwapi4/Unit;)Z
+ * Signature: (JLbwapi/Unit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_load_1native__JLbwapi4_Unit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_load_1native__JLbwapi_Unit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    load_native
- * Signature: (JLbwapi4/Unit;Z)Z
+ * Signature: (JLbwapi/Unit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_load_1native__JLbwapi4_Unit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_load_1native__JLbwapi_Unit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    unloadAll_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    unloadAll_native
  * Signature: (JZ)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__JZ
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JZ
   (JNIEnv *, jobject, jlong, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    unloadAll_native
- * Signature: (JLbwapi4/Position;)Z
+ * Signature: (JLbwapi/Position;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__JLbwapi4_Position_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JLbwapi_Position_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    unloadAll_native
- * Signature: (JLbwapi4/Position;Z)Z
+ * Signature: (JLbwapi/Position;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_unloadAll_1native__JLbwapi4_Position_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JLbwapi_Position_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    rightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_rightClick_1native__JLbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_rightClick_1native__JLbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    rightClick_native
- * Signature: (JLbwapi4/PositionOrUnit;Z)Z
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_rightClick_1native__JLbwapi4_PositionOrUnit_2Z
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_rightClick_1native__JLbwapi_PositionOrUnit_2Z
   (JNIEnv *, jobject, jlong, jobject, jboolean);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    haltConstruction_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_haltConstruction_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_haltConstruction_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cancelConstruction_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelConstruction_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelConstruction_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cancelAddon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelAddon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelAddon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cancelTrain_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelTrain_1native__J
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelTrain_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cancelTrain_native
  * Signature: (JI)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelTrain_1native__JI
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelTrain_1native__JI
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cancelMorph_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelMorph_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelMorph_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cancelResearch_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelResearch_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelResearch_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    cancelUpgrade_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_cancelUpgrade_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelUpgrade_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    useTech_native
- * Signature: (JLbwapi4/TechType;)Z
+ * Signature: (JLbwapi/TechType;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_useTech_1native__JLbwapi4_TechType_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_useTech_1native__JLbwapi_TechType_2
   (JNIEnv *, jobject, jlong, jobject);
 
 /*
- * Class:     bwapi4_Unitset
+ * Class:     bwapi_Unitset
  * Method:    useTech_native
- * Signature: (JLbwapi4/TechType;Lbwapi4/PositionOrUnit;)Z
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_Unitset_useTech_1native__JLbwapi4_TechType_2Lbwapi4_PositionOrUnit_2
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_useTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2
   (JNIEnv *, jobject, jlong, jobject, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_UnitSizeType */
+/* Header for class bwapi_UnitSizeType */
 
-#ifndef _Included_bwapi4_UnitSizeType
-#define _Included_bwapi4_UnitSizeType
+#ifndef _Included_bwapi_UnitSizeType
+#define _Included_bwapi_UnitSizeType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_UnitSizeType
+ * Class:     bwapi_UnitSizeType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_UnitSizeType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_UnitSizeType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_UnitType */
+/* Header for class bwapi_UnitType */
 
-#ifndef _Included_bwapi4_UnitType
-#define _Included_bwapi4_UnitType
+#ifndef _Included_bwapi_UnitType
+#define _Included_bwapi_UnitType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_UnitType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_UnitType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    getRace_native
- * Signature: (J)Lbwapi4/Race;
+ * Signature: (J)Lbwapi/Race;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_getRace_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_getRace_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    requiredTech_native
- * Signature: (J)Lbwapi4/TechType;
+ * Signature: (J)Lbwapi/TechType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_requiredTech_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_requiredTech_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    cloakingTech_native
- * Signature: (J)Lbwapi4/TechType;
+ * Signature: (J)Lbwapi/TechType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_cloakingTech_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_cloakingTech_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    armorUpgrade_native
- * Signature: (J)Lbwapi4/UpgradeType;
+ * Signature: (J)Lbwapi/UpgradeType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_armorUpgrade_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_armorUpgrade_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    maxHitPoints_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxHitPoints_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxHitPoints_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    maxShields_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxShields_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxShields_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    maxEnergy_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxEnergy_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxEnergy_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    armor_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_armor_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_armor_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    mineralPrice_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_mineralPrice_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_mineralPrice_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    gasPrice_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_gasPrice_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_gasPrice_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    buildTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_buildTime_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_buildTime_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    supplyRequired_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_supplyRequired_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_supplyRequired_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    supplyProvided_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_supplyProvided_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_supplyProvided_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    spaceRequired_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_spaceRequired_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_spaceRequired_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    spaceProvided_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_spaceProvided_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_spaceProvided_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    buildScore_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_buildScore_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_buildScore_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    destroyScore_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_destroyScore_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_destroyScore_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    size_native
- * Signature: (J)Lbwapi4/UnitSizeType;
+ * Signature: (J)Lbwapi/UnitSizeType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_size_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_size_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    tileWidth_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_tileWidth_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_tileWidth_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    tileHeight_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_tileHeight_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_tileHeight_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    tileSize_native
- * Signature: (J)Lbwapi4/TilePosition;
+ * Signature: (J)Lbwapi/TilePosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_tileSize_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_tileSize_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    dimensionLeft_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionLeft_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionLeft_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    dimensionUp_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionUp_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionUp_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    dimensionRight_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionRight_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionRight_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    dimensionDown_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_dimensionDown_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionDown_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    width_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_width_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_width_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    height_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_height_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_height_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    seekRange_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_seekRange_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_seekRange_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    sightRange_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_sightRange_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_sightRange_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    groundWeapon_native
- * Signature: (J)Lbwapi4/WeaponType;
+ * Signature: (J)Lbwapi/WeaponType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_groundWeapon_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_groundWeapon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    maxGroundHits_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxGroundHits_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxGroundHits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    airWeapon_native
- * Signature: (J)Lbwapi4/WeaponType;
+ * Signature: (J)Lbwapi/WeaponType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UnitType_airWeapon_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_airWeapon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    maxAirHits_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_maxAirHits_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxAirHits_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    topSpeed_native
  * Signature: (J)D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_UnitType_topSpeed_1native
+JNIEXPORT jdouble JNICALL Java_bwapi_UnitType_topSpeed_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    acceleration_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_acceleration_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_acceleration_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    haltDistance_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_haltDistance_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_haltDistance_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    turnRadius_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UnitType_turnRadius_1native
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_turnRadius_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    canProduce_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canProduce_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canProduce_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    canAttack_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canAttack_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canAttack_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    canMove_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canMove_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canMove_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isFlyer_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isFlyer_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlyer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    regeneratesHP_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_regeneratesHP_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_regeneratesHP_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isSpellcaster_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isSpellcaster_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpellcaster_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    hasPermanentCloak_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_hasPermanentCloak_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_hasPermanentCloak_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isInvincible_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isInvincible_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isInvincible_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isOrganic_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isOrganic_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isOrganic_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isMechanical_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isMechanical_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isMechanical_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isRobotic_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isRobotic_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isRobotic_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isDetector_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isDetector_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isDetector_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isResourceContainer_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isResourceContainer_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isResourceContainer_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isResourceDepot_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isResourceDepot_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isResourceDepot_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isRefinery_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isRefinery_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isRefinery_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isWorker_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isWorker_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isWorker_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    requiresPsi_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_requiresPsi_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_requiresPsi_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    requiresCreep_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_requiresCreep_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_requiresCreep_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isTwoUnitsInOneEgg_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isTwoUnitsInOneEgg_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isTwoUnitsInOneEgg_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isBurrowable_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isBurrowable_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBurrowable_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isCloakable_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isCloakable_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isCloakable_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isBuilding_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isBuilding_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBuilding_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isAddon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isAddon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isAddon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isFlyingBuilding_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isFlyingBuilding_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlyingBuilding_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isNeutral_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isNeutral_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isNeutral_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isHero_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isHero_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isHero_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isPowerup_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isPowerup_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isPowerup_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isBeacon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isBeacon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBeacon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isFlagBeacon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isFlagBeacon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlagBeacon_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isSpecialBuilding_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isSpecialBuilding_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpecialBuilding_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isSpell_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isSpell_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpell_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    producesLarva_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_producesLarva_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_producesLarva_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isMineralField_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isMineralField_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isMineralField_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    isCritter_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_isCritter_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isCritter_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UnitType
+ * Class:     bwapi_UnitType
  * Method:    canBuildAddon_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_UnitType_canBuildAddon_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canBuildAddon_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_UpgradeType */
+/* Header for class bwapi_UpgradeType */
 
-#ifndef _Included_bwapi4_UpgradeType
-#define _Included_bwapi4_UpgradeType
+#ifndef _Included_bwapi_UpgradeType
+#define _Included_bwapi_UpgradeType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_UpgradeType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_UpgradeType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    getRace_native
- * Signature: (J)Lbwapi4/Race;
+ * Signature: (J)Lbwapi/Race;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_getRace_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_getRace_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    mineralPrice_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_mineralPrice_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPrice_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    mineralPrice_native
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_mineralPrice_1native__JI
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPrice_1native__JI
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    mineralPriceFactor_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_mineralPriceFactor_1native
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPriceFactor_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    gasPrice_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_gasPrice_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPrice_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    gasPrice_native
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_gasPrice_1native__JI
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPrice_1native__JI
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    gasPriceFactor_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_gasPriceFactor_1native
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPriceFactor_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    upgradeTime_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_upgradeTime_1native__J
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTime_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    upgradeTime_native
  * Signature: (JI)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_upgradeTime_1native__JI
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTime_1native__JI
   (JNIEnv *, jobject, jlong, jint);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    upgradeTimeFactor_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_upgradeTimeFactor_1native
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTimeFactor_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    maxRepeats_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_UpgradeType_maxRepeats_1native
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_maxRepeats_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    whatUpgrades_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_whatUpgrades_1native
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatUpgrades_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    whatsRequired_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_whatsRequired_1native__J
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatsRequired_1native__J
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_UpgradeType
+ * Class:     bwapi_UpgradeType
  * Method:    whatsRequired_native
- * Signature: (JI)Lbwapi4/UnitType;
+ * Signature: (JI)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_UpgradeType_whatsRequired_1native__JI
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatsRequired_1native__JI
   (JNIEnv *, jobject, jlong, jint);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_Utils */
+/* Header for class bwapi_Utils */
 
-#ifndef _Included_bwapi4_Utils
-#define _Included_bwapi4_Utils
+#ifndef _Included_bwapi_Utils
+#define _Included_bwapi_Utils
 #ifdef __cplusplus
 extern "C" {
 #endif
-#undef bwapi4_Utils_Previous
-#define bwapi4_Utils_Previous 1L
-#undef bwapi4_Utils_Cyan
-#define bwapi4_Utils_Cyan 2L
-#undef bwapi4_Utils_Yellow
-#define bwapi4_Utils_Yellow 3L
-#undef bwapi4_Utils_White
-#define bwapi4_Utils_White 4L
-#undef bwapi4_Utils_Grey
-#define bwapi4_Utils_Grey 5L
-#undef bwapi4_Utils_Red
-#define bwapi4_Utils_Red 6L
-#undef bwapi4_Utils_Green
-#define bwapi4_Utils_Green 7L
-#undef bwapi4_Utils_Red_P1
-#define bwapi4_Utils_Red_P1 8L
-#undef bwapi4_Utils_Tab
-#define bwapi4_Utils_Tab 9L
-#undef bwapi4_Utils_Newline
-#define bwapi4_Utils_Newline 10L
-#undef bwapi4_Utils_Invisible_no_override
-#define bwapi4_Utils_Invisible_no_override 11L
-#undef bwapi4_Utils_Remove_beyond
-#define bwapi4_Utils_Remove_beyond 12L
-#undef bwapi4_Utils_Clear_formatting
-#define bwapi4_Utils_Clear_formatting 13L
-#undef bwapi4_Utils_Blue
-#define bwapi4_Utils_Blue 14L
-#undef bwapi4_Utils_Teal
-#define bwapi4_Utils_Teal 15L
-#undef bwapi4_Utils_Purple
-#define bwapi4_Utils_Purple 16L
-#undef bwapi4_Utils_Orange
-#define bwapi4_Utils_Orange 17L
-#undef bwapi4_Utils_Right_Align
-#define bwapi4_Utils_Right_Align 18L
-#undef bwapi4_Utils_Center_Align
-#define bwapi4_Utils_Center_Align 19L
-#undef bwapi4_Utils_Invisible
-#define bwapi4_Utils_Invisible 20L
-#undef bwapi4_Utils_Brown
-#define bwapi4_Utils_Brown 21L
-#undef bwapi4_Utils_White_p7
-#define bwapi4_Utils_White_p7 22L
-#undef bwapi4_Utils_Yellow_p8
-#define bwapi4_Utils_Yellow_p8 23L
-#undef bwapi4_Utils_Green_p9
-#define bwapi4_Utils_Green_p9 24L
-#undef bwapi4_Utils_Brighter_Yellow
-#define bwapi4_Utils_Brighter_Yellow 25L
-#undef bwapi4_Utils_Cyan_default
-#define bwapi4_Utils_Cyan_default 26L
-#undef bwapi4_Utils_Pinkish
-#define bwapi4_Utils_Pinkish 27L
-#undef bwapi4_Utils_Dark_Cyan
-#define bwapi4_Utils_Dark_Cyan 28L
-#undef bwapi4_Utils_Greygreen
-#define bwapi4_Utils_Greygreen 29L
-#undef bwapi4_Utils_Bluegrey
-#define bwapi4_Utils_Bluegrey 30L
-#undef bwapi4_Utils_Turquoise
-#define bwapi4_Utils_Turquoise 31L
+#undef bwapi_Utils_Previous
+#define bwapi_Utils_Previous 1L
+#undef bwapi_Utils_Cyan
+#define bwapi_Utils_Cyan 2L
+#undef bwapi_Utils_Yellow
+#define bwapi_Utils_Yellow 3L
+#undef bwapi_Utils_White
+#define bwapi_Utils_White 4L
+#undef bwapi_Utils_Grey
+#define bwapi_Utils_Grey 5L
+#undef bwapi_Utils_Red
+#define bwapi_Utils_Red 6L
+#undef bwapi_Utils_Green
+#define bwapi_Utils_Green 7L
+#undef bwapi_Utils_Red_P1
+#define bwapi_Utils_Red_P1 8L
+#undef bwapi_Utils_Tab
+#define bwapi_Utils_Tab 9L
+#undef bwapi_Utils_Newline
+#define bwapi_Utils_Newline 10L
+#undef bwapi_Utils_Invisible_no_override
+#define bwapi_Utils_Invisible_no_override 11L
+#undef bwapi_Utils_Remove_beyond
+#define bwapi_Utils_Remove_beyond 12L
+#undef bwapi_Utils_Clear_formatting
+#define bwapi_Utils_Clear_formatting 13L
+#undef bwapi_Utils_Blue
+#define bwapi_Utils_Blue 14L
+#undef bwapi_Utils_Teal
+#define bwapi_Utils_Teal 15L
+#undef bwapi_Utils_Purple
+#define bwapi_Utils_Purple 16L
+#undef bwapi_Utils_Orange
+#define bwapi_Utils_Orange 17L
+#undef bwapi_Utils_Right_Align
+#define bwapi_Utils_Right_Align 18L
+#undef bwapi_Utils_Center_Align
+#define bwapi_Utils_Center_Align 19L
+#undef bwapi_Utils_Invisible
+#define bwapi_Utils_Invisible 20L
+#undef bwapi_Utils_Brown
+#define bwapi_Utils_Brown 21L
+#undef bwapi_Utils_White_p7
+#define bwapi_Utils_White_p7 22L
+#undef bwapi_Utils_Yellow_p8
+#define bwapi_Utils_Yellow_p8 23L
+#undef bwapi_Utils_Green_p9
+#define bwapi_Utils_Green_p9 24L
+#undef bwapi_Utils_Brighter_Yellow
+#define bwapi_Utils_Brighter_Yellow 25L
+#undef bwapi_Utils_Cyan_default
+#define bwapi_Utils_Cyan_default 26L
+#undef bwapi_Utils_Pinkish
+#define bwapi_Utils_Pinkish 27L
+#undef bwapi_Utils_Dark_Cyan
+#define bwapi_Utils_Dark_Cyan 28L
+#undef bwapi_Utils_Greygreen
+#define bwapi_Utils_Greygreen 29L
+#undef bwapi_Utils_Bluegrey
+#define bwapi_Utils_Bluegrey 30L
+#undef bwapi_Utils_Turquoise
+#define bwapi_Utils_Turquoise 31L
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_WalkPosition */
+/* Header for class bwapi_WalkPosition */
 
-#ifndef _Included_bwapi4_WalkPosition
-#define _Included_bwapi4_WalkPosition
+#ifndef _Included_bwapi_WalkPosition
+#define _Included_bwapi_WalkPosition
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_WalkPosition
+ * Class:     bwapi_WalkPosition
  * Method:    isValid
  * Signature: ()Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WalkPosition_isValid
+JNIEXPORT jboolean JNICALL Java_bwapi_WalkPosition_isValid
   (JNIEnv *, jobject);
 
 /*
- * Class:     bwapi4_WalkPosition
+ * Class:     bwapi_WalkPosition
  * Method:    makeValid
- * Signature: ()Lbwapi4/WalkPosition;
+ * Signature: ()Lbwapi/WalkPosition;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_WalkPosition_makeValid
+JNIEXPORT jobject JNICALL Java_bwapi_WalkPosition_makeValid
   (JNIEnv *, jobject);
 
 /*
- * Class:     bwapi4_WalkPosition
- * Method:    getDistance
- * Signature: (Lbwapi4/WalkPosition;)D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_WalkPosition_getDistance
-  (JNIEnv *, jobject, jobject);
-
-/*
- * Class:     bwapi4_WalkPosition
+ * Class:     bwapi_WalkPosition
  * Method:    getApproxDistance
- * Signature: (Lbwapi4/WalkPosition;)I
+ * Signature: (Lbwapi/WalkPosition;)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WalkPosition_getApproxDistance
+JNIEXPORT jint JNICALL Java_bwapi_WalkPosition_getApproxDistance
   (JNIEnv *, jobject, jobject);
 
 /*
- * Class:     bwapi4_WalkPosition
+ * Class:     bwapi_WalkPosition
  * Method:    getLength
  * Signature: ()D
  */
-JNIEXPORT jdouble JNICALL Java_bwapi4_WalkPosition_getLength
+JNIEXPORT jdouble JNICALL Java_bwapi_WalkPosition_getLength
   (JNIEnv *, jobject);
 
 #ifdef __cplusplus
 }
 #endif
 #endif
-/* Header for class bwapi4_WeaponType */
+/* Header for class bwapi_WeaponType */
 
-#ifndef _Included_bwapi4_WeaponType
-#define _Included_bwapi4_WeaponType
+#ifndef _Included_bwapi_WeaponType
+#define _Included_bwapi_WeaponType
 #ifdef __cplusplus
 extern "C" {
 #endif
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    toString_native
  * Signature: (J)Ljava/lang/String;
  */
-JNIEXPORT jstring JNICALL Java_bwapi4_WeaponType_toString_1native
+JNIEXPORT jstring JNICALL Java_bwapi_WeaponType_toString_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    getTech_native
- * Signature: (J)Lbwapi4/TechType;
+ * Signature: (J)Lbwapi/TechType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_getTech_1native
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_getTech_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    whatUses_native
- * Signature: (J)Lbwapi4/UnitType;
+ * Signature: (J)Lbwapi/UnitType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_whatUses_1native
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_whatUses_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    damageAmount_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageAmount_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageAmount_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    damageBonus_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageBonus_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageBonus_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    damageCooldown_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageCooldown_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageCooldown_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    damageFactor_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_damageFactor_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageFactor_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    upgradeType_native
- * Signature: (J)Lbwapi4/UpgradeType;
+ * Signature: (J)Lbwapi/UpgradeType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_upgradeType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_upgradeType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    damageType_native
- * Signature: (J)Lbwapi4/DamageType;
+ * Signature: (J)Lbwapi/DamageType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_damageType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_damageType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    explosionType_native
- * Signature: (J)Lbwapi4/ExplosionType;
+ * Signature: (J)Lbwapi/ExplosionType;
  */
-JNIEXPORT jobject JNICALL Java_bwapi4_WeaponType_explosionType_1native
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_explosionType_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    minRange_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_minRange_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_minRange_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    maxRange_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_maxRange_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_maxRange_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    innerSplashRadius_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_innerSplashRadius_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_innerSplashRadius_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    medianSplashRadius_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_medianSplashRadius_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_medianSplashRadius_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    outerSplashRadius_native
  * Signature: (J)I
  */
-JNIEXPORT jint JNICALL Java_bwapi4_WeaponType_outerSplashRadius_1native
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_outerSplashRadius_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsAir_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsAir_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsAir_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsGround_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsGround_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsGround_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsMechanical_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsMechanical_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsMechanical_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsOrganic_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsOrganic_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOrganic_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsNonBuilding_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsNonBuilding_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsNonBuilding_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsNonRobotic_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsNonRobotic_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsNonRobotic_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsTerrain_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsTerrain_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsTerrain_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsOrgOrMech_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsOrgOrMech_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOrgOrMech_1native
   (JNIEnv *, jobject, jlong);
 
 /*
- * Class:     bwapi4_WeaponType
+ * Class:     bwapi_WeaponType
  * Method:    targetsOwn_native
  * Signature: (J)Z
  */
-JNIEXPORT jboolean JNICALL Java_bwapi4_WeaponType_targetsOwn_1native
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOwn_1native
   (JNIEnv *, jobject, jlong);
 
 #ifdef __cplusplus
diff --git a/generated/bwapi/AIModule.java b/generated/bwapi/AIModule.java
new file mode 100644
index 0000000..98891a6
--- /dev/null
+++ b/generated/bwapi/AIModule.java
@@ -0,0 +1,130 @@
+package bwapi;
+
+import bwapi.BWEventListener;
+
+/**
+ * This class receives all events from Broodwar.
+ * To process them, receive an AIModule's instance from {@link Mirror} and call {@link #setEventListener(bwapi.BWEventListener)}
+ * to set you own {@link BWEventListener listener}.
+ * There's also a stub class ({@link DefaultBWListener}) provided, so you don't have to implement all of the methods.
+ */
+public class AIModule {
+
+    AIModule(){}
+
+    private BWEventListener eventListener;
+
+    public void setEventListener(BWEventListener eventListener) {
+        this.eventListener = eventListener;
+    }
+
+    public void onStart() {
+        if (eventListener != null) {
+            eventListener.onStart();
+        }
+    }
+
+    public void onEnd(boolean isWinner) {
+        if (eventListener != null) {
+            eventListener.onEnd(isWinner);
+        }
+    }
+
+    public void onFrame() {
+        if (eventListener != null) {
+            eventListener.onFrame();
+        }
+    }
+
+    public void onSendText(String text) {
+        if (eventListener != null)
+        {
+            eventListener.onSendText(text);
+        }
+    }
+
+    public void onReceiveText(Player player, String text) {
+        if (eventListener != null) {
+            eventListener.onReceiveText(player, text);
+        }
+    }
+
+    public void onPlayerLeft(Player player) {
+        if (eventListener != null) {
+            eventListener.onPlayerLeft(player);
+        }
+    }
+
+    public void onNukeDetect(Position target) {
+        if (eventListener != null) {
+            eventListener.onNukeDetect(target);
+        }
+    }
+
+    public void onUnitDiscover(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitDiscover(unit);
+        }
+    }
+
+    public void onUnitEvade(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitEvade(unit);
+        }
+    }
+
+    public void onUnitShow(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitShow(unit);
+        }
+    }
+
+    public void onUnitHide(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitHide(unit);
+        }
+    }
+
+    public void onUnitCreate(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitCreate(unit);
+        }
+    }
+
+    public void onUnitDestroy(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitDestroy(unit);
+        }
+    }
+
+    public void onUnitMorph(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitMorph(unit);
+        }
+    }
+
+    public void onUnitRenegade(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitRenegade(unit);
+        }
+    }
+
+    public void onSaveGame(String gameName) {
+        if (eventListener != null) {
+            eventListener.onSaveGame(gameName);
+        }
+    }
+
+    public void onUnitComplete(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitComplete(unit);
+        }
+    }
+
+    public void onPlayerDropped(Player player) {
+        if (eventListener != null) {
+            eventListener.onPlayerDropped(player);
+        }
+    }
+
+}
diff --git a/generated/bwapi/AbstractPoint.java b/generated/bwapi/AbstractPoint.java
new file mode 100644
index 0000000..067ca6c
--- /dev/null
+++ b/generated/bwapi/AbstractPoint.java
@@ -0,0 +1,30 @@
+package bwapi;
+
+/**
+ * Common ancestor for location based objects to simplify distance computation.
+ * This will be refactored into interface with default methods when java 8 becomes widely used.
+ *
+ * Idea by Rafa³ Poniatowski
+ */
+public abstract class AbstractPoint<T extends AbstractPoint> {
+
+    public abstract T getPoint();
+
+    public int getX(){
+        return getPoint().getX();
+    }
+
+    public int getY(){
+        return getPoint().getY();
+    }
+
+    public double getDistance(AbstractPoint<T> otherPosition) {
+        return getDistance(otherPosition.getX(), otherPosition.getY());
+    }
+
+    public double getDistance(int x, int y) {
+        double dx = x - getX();
+        double dy = y - getY();
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/BWEventListener.java b/generated/bwapi/BWEventListener.java
new file mode 100644
index 0000000..84cbb09
--- /dev/null
+++ b/generated/bwapi/BWEventListener.java
@@ -0,0 +1,53 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Implement this interface and call {@link AIModule#setEventListener(bwapi.BWEventListener)} to receive all of the in game events.
+ */
+public interface BWEventListener {
+
+    public void onStart();
+
+    public void onEnd(boolean isWinner);
+
+    public void onFrame();
+
+    public void onSendText(String text);
+
+    public void onReceiveText(Player player, String text);
+
+    public void onPlayerLeft(Player player);
+
+    public void onNukeDetect(Position target);
+
+    public void onUnitDiscover(Unit unit);
+
+    public void onUnitEvade(Unit unit);
+
+    public void onUnitShow(Unit unit);
+
+    public void onUnitHide(Unit unit);
+
+    public void onUnitCreate(Unit unit);
+
+    public void onUnitDestroy(Unit unit);
+
+    public void onUnitMorph(Unit unit);
+
+    public void onUnitRenegade(Unit unit);
+
+    public void onSaveGame(String gameName);
+
+    public void onUnitComplete(Unit unit);
+
+    public void onPlayerDropped(Player player);
+
+}
+
+
diff --git a/generated/bwapi/BestFilter.java b/generated/bwapi/BestFilter.java
new file mode 100644
index 0000000..82374a6
--- /dev/null
+++ b/generated/bwapi/BestFilter.java
@@ -0,0 +1,34 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class BestFilter {
+
+
+    private static Map<Long, BestFilter> instances = new HashMap<Long, BestFilter>();
+
+    private BestFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static BestFilter get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        BestFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new BestFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi/BestUnitFilter.java b/generated/bwapi/BestUnitFilter.java
new file mode 100644
index 0000000..7b57f8c
--- /dev/null
+++ b/generated/bwapi/BestUnitFilter.java
@@ -0,0 +1,31 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class BestUnitFilter {
+
+
+    private static Map<Long, BestUnitFilter> instances = new HashMap<Long, BestUnitFilter>();
+
+    private BestUnitFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static BestUnitFilter get(long pointer) {
+        BestUnitFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new BestUnitFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi/Bullet.java b/generated/bwapi/Bullet.java
new file mode 100644
index 0000000..94abae7
--- /dev/null
+++ b/generated/bwapi/Bullet.java
@@ -0,0 +1,118 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Bullet {
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public boolean exists() {
+        return exists_native(pointer);
+    }
+
+    public Player getPlayer() {
+        return getPlayer_native(pointer);
+    }
+
+    public BulletType getType() {
+        return getType_native(pointer);
+    }
+
+    public Unit getSource() {
+        return getSource_native(pointer);
+    }
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public double getAngle() {
+        return getAngle_native(pointer);
+    }
+
+    public double getVelocityX() {
+        return getVelocityX_native(pointer);
+    }
+
+    public double getVelocityY() {
+        return getVelocityY_native(pointer);
+    }
+
+    public Unit getTarget() {
+        return getTarget_native(pointer);
+    }
+
+    public Position getTargetPosition() {
+        return getTargetPosition_native(pointer);
+    }
+
+    public int getRemoveTimer() {
+        return getRemoveTimer_native(pointer);
+    }
+
+    public boolean isVisible() {
+        return isVisible_native(pointer);
+    }
+
+    public boolean isVisible(Player player) {
+        return isVisible_native(pointer, player);
+    }
+
+
+    private static Map<Long, Bullet> instances = new HashMap<Long, Bullet>();
+
+    private Bullet(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Bullet get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Bullet instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Bullet(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native boolean exists_native(long pointer);
+
+    private native Player getPlayer_native(long pointer);
+
+    private native BulletType getType_native(long pointer);
+
+    private native Unit getSource_native(long pointer);
+
+    private native Position getPosition_native(long pointer);
+
+    private native double getAngle_native(long pointer);
+
+    private native double getVelocityX_native(long pointer);
+
+    private native double getVelocityY_native(long pointer);
+
+    private native Unit getTarget_native(long pointer);
+
+    private native Position getTargetPosition_native(long pointer);
+
+    private native int getRemoveTimer_native(long pointer);
+
+    private native boolean isVisible_native(long pointer);
+
+    private native boolean isVisible_native(long pointer, Player player);
+
+
+}
diff --git a/generated/bwapi/BulletType.java b/generated/bwapi/BulletType.java
new file mode 100644
index 0000000..86dc67e
--- /dev/null
+++ b/generated/bwapi/BulletType.java
@@ -0,0 +1,114 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class BulletType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static BulletType Melee;
+
+    public static BulletType Fusion_Cutter_Hit;
+
+    public static BulletType Gauss_Rifle_Hit;
+
+    public static BulletType C_10_Canister_Rifle_Hit;
+
+    public static BulletType Gemini_Missiles;
+
+    public static BulletType Fragmentation_Grenade;
+
+    public static BulletType Longbolt_Missile;
+
+    public static BulletType ATS_ATA_Laser_Battery;
+
+    public static BulletType Burst_Lasers;
+
+    public static BulletType Arclite_Shock_Cannon_Hit;
+
+    public static BulletType EMP_Missile;
+
+    public static BulletType Dual_Photon_Blasters_Hit;
+
+    public static BulletType Particle_Beam_Hit;
+
+    public static BulletType Anti_Matter_Missile;
+
+    public static BulletType Pulse_Cannon;
+
+    public static BulletType Psionic_Shockwave_Hit;
+
+    public static BulletType Psionic_Storm;
+
+    public static BulletType Yamato_Gun;
+
+    public static BulletType Phase_Disruptor;
+
+    public static BulletType STA_STS_Cannon_Overlay;
+
+    public static BulletType Sunken_Colony_Tentacle;
+
+    public static BulletType Acid_Spore;
+
+    public static BulletType Glave_Wurm;
+
+    public static BulletType Seeker_Spores;
+
+    public static BulletType Queen_Spell_Carrier;
+
+    public static BulletType Plague_Cloud;
+
+    public static BulletType Consume;
+
+    public static BulletType Ensnare;
+
+    public static BulletType Needle_Spine_Hit;
+
+    public static BulletType Invisible;
+
+    public static BulletType Optical_Flare_Grenade;
+
+    public static BulletType Halo_Rockets;
+
+    public static BulletType Subterranean_Spines;
+
+    public static BulletType Corrosive_Acid_Shot;
+
+    public static BulletType Neutron_Flare;
+
+    public static BulletType None;
+
+    public static BulletType Unknown;
+
+
+    private static Map<Long, BulletType> instances = new HashMap<Long, BulletType>();
+
+    private BulletType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static BulletType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        BulletType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new BulletType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Bulletset.java b/generated/bwapi/Bulletset.java
new file mode 100644
index 0000000..c6ebd4b
--- /dev/null
+++ b/generated/bwapi/Bulletset.java
@@ -0,0 +1,34 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Bulletset {
+
+
+    private static Map<Long, Bulletset> instances = new HashMap<Long, Bulletset>();
+
+    private Bulletset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Bulletset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Bulletset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Bulletset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi/CenteredObject.java b/generated/bwapi/CenteredObject.java
new file mode 100644
index 0000000..dd751b0
--- /dev/null
+++ b/generated/bwapi/CenteredObject.java
@@ -0,0 +1,15 @@
+package bwapi;
+
+import bwapi.Position;
+
+/**
+ * Interrmediate class used to translate getPoint() calls to getCenter() calls.
+ */
+public abstract class CenteredObject extends AbstractPoint<Position> {
+
+    public Position getPoint(){
+        return getCenter();
+    }
+
+    public abstract Position getCenter();
+}
\ No newline at end of file
diff --git a/generated/bwapi/Client.java b/generated/bwapi/Client.java
new file mode 100644
index 0000000..7ca6341
--- /dev/null
+++ b/generated/bwapi/Client.java
@@ -0,0 +1,58 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Client {
+
+    public boolean isConnected() {
+        return isConnected_native(pointer);
+    }
+
+    public boolean connect() {
+        return connect_native(pointer);
+    }
+
+    public void disconnect() {
+        disconnect_native(pointer);
+    }
+
+    public void update() {
+        update_native(pointer);
+    }
+
+
+    private static Map<Long, Client> instances = new HashMap<Long, Client>();
+
+    private Client(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Client get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Client instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Client(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native boolean isConnected_native(long pointer);
+
+    private native boolean connect_native(long pointer);
+
+    private native void disconnect_native(long pointer);
+
+    private native void update_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Color.java b/generated/bwapi/Color.java
new file mode 100644
index 0000000..ab029c8
--- /dev/null
+++ b/generated/bwapi/Color.java
@@ -0,0 +1,73 @@
+package bwapi;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Starcraft uses a 256 color palette to render everything,
+ * so the colors available for draw shapes using BWAPI is limited to the colors available in the <a href="http://bwapi.googlecode.com/svn/wiki/colorPalette.gif" target="_blank">Pallete</a>.
+ * Several predefined colors from the pallete are provided.
+ */
+public class Color {
+
+    private int r, g, b;
+
+    /**
+     * Create a color using the color in the palette that is closest to the RGB color specified. This will check a number of colors in the pallet to see which is closest to the specified color so this function is relatively slow.
+     * @param r
+     * @param g
+     * @param b
+     */
+    public Color(int r, int g, int b) {
+        this.r = r;
+        this.g = g;
+        this.b = b;
+    }
+
+    public static Color Red;
+
+    public static Color Blue;
+
+    public static Color Teal;
+
+    public static Color Purple;
+
+    public static Color Orange;
+
+    public static Color Brown;
+
+    public static Color White;
+
+    public static Color Yellow;
+
+    public static Color Green;
+
+    public static Color Cyan;
+
+    public static Color Black;
+
+    public static Color Grey;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Color)) return false;
+
+        Color color = (Color) o;
+
+        if (b != color.b) return false;
+        if (g != color.g) return false;
+        if (r != color.r) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = r;
+        result = 31 * result + g;
+        result = 31 * result + b;
+        return result;
+    }
+}
diff --git a/generated/bwapi/CommandType/Enum.java b/generated/bwapi/CommandType/Enum.java
new file mode 100644
index 0000000..62077c8
--- /dev/null
+++ b/generated/bwapi/CommandType/Enum.java
@@ -0,0 +1,41 @@
+package bwapi.CommandType;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	None(0),
+	SetScreenPosition(1),
+	PingMinimap(2),
+	EnableFlag(3),
+	Printf(4),
+	SendText(5),
+	PauseGame(6),
+	ResumeGame(7),
+	LeaveGame(8),
+	RestartGame(9),
+	SetLocalSpeed(10),
+	SetLatCom(11),
+	SetGui(12),
+	SetFrameSkip(13),
+	SetMap(14),
+	SetAllies(15),
+	SetVision(16),
+	SetCommandOptimizerLevel(17);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/CompareFilter.java b/generated/bwapi/CompareFilter.java
new file mode 100644
index 0000000..c1a0a3f
--- /dev/null
+++ b/generated/bwapi/CompareFilter.java
@@ -0,0 +1,34 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class CompareFilter {
+
+
+    private static Map<Long, CompareFilter> instances = new HashMap<Long, CompareFilter>();
+
+    private CompareFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static CompareFilter get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        CompareFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new CompareFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi/CoordinateType/Enum.java b/generated/bwapi/CoordinateType/Enum.java
new file mode 100644
index 0000000..17c6fff
--- /dev/null
+++ b/generated/bwapi/CoordinateType/Enum.java
@@ -0,0 +1,27 @@
+package bwapi.CoordinateType;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	None(0),
+	Screen(1),
+	Map(2),
+	Mouse(3);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/DamageType.java b/generated/bwapi/DamageType.java
new file mode 100644
index 0000000..b90585b
--- /dev/null
+++ b/generated/bwapi/DamageType.java
@@ -0,0 +1,54 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class DamageType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static DamageType Independent;
+
+    public static DamageType Explosive;
+
+    public static DamageType Concussive;
+
+    public static DamageType Normal;
+
+    public static DamageType Ignore_Armor;
+
+    public static DamageType None;
+
+    public static DamageType Unknown;
+
+
+    private static Map<Long, DamageType> instances = new HashMap<Long, DamageType>();
+
+    private DamageType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static DamageType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        DamageType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new DamageType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/DefaultBWListener.java b/generated/bwapi/DefaultBWListener.java
new file mode 100644
index 0000000..eb3de83
--- /dev/null
+++ b/generated/bwapi/DefaultBWListener.java
@@ -0,0 +1,103 @@
+package bwapi;
+
+import bwapi.BWEventListener;
+import bwapi.Player;
+import bwapi.Position;
+import bwapi.Unit;
+
+/**
+ * A utility stub class providing a default implementation of {@link BWEventListener},
+ * override it's methods if you want to handle only some events.
+ */
+public class DefaultBWListener implements BWEventListener {
+
+    @Override
+    public void onStart() {
+
+    }
+
+    @Override
+    public void onEnd(boolean b) {
+
+    }
+
+    @Override
+    public void onFrame() {
+
+    }
+
+    @Override
+    public void onSendText(String s) {
+
+    }
+
+    @Override
+    public void onReceiveText(Player player, String s) {
+
+    }
+
+    @Override
+    public void onPlayerLeft(Player player) {
+
+    }
+
+    @Override
+    public void onNukeDetect(Position position) {
+
+    }
+
+    @Override
+    public void onUnitDiscover(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitEvade(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitShow(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitHide(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitCreate(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitDestroy(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitMorph(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitRenegade(Unit unit) {
+
+    }
+
+    @Override
+    public void onSaveGame(String s) {
+
+    }
+
+    @Override
+    public void onUnitComplete(Unit unit) {
+
+    }
+
+    @Override
+    public void onPlayerDropped(Player player) {
+
+    }
+}
diff --git a/generated/bwapi/Enum/Enum.java b/generated/bwapi/Enum/Enum.java
new file mode 100644
index 0000000..c287c5e
--- /dev/null
+++ b/generated/bwapi/Enum/Enum.java
@@ -0,0 +1,126 @@
+package bwapi.Enum;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	Gauss_Rifle(0),
+	Gauss_Rifle_Jim_Raynor(1),
+	C_10_Canister_Rifle(2),
+	C_10_Canister_Rifle_Sarah_Kerrigan(3),
+	Fragmentation_Grenade(4),
+	Fragmentation_Grenade_Jim_Raynor(5),
+	Spider_Mines(6),
+	Twin_Autocannons(7),
+	Hellfire_Missile_Pack(8),
+	Twin_Autocannons_Alan_Schezar(9),
+	Hellfire_Missile_Pack_Alan_Schezar(10),
+	Arclite_Cannon(11),
+	Arclite_Cannon_Edmund_Duke(12),
+	Fusion_Cutter(13),
+	Gemini_Missiles(15),
+	Burst_Lasers(16),
+	Gemini_Missiles_Tom_Kazansky(17),
+	Burst_Lasers_Tom_Kazansky(18),
+	ATS_Laser_Battery(19),
+	ATA_Laser_Battery(20),
+	ATS_Laser_Battery_Hero(21),
+	ATA_Laser_Battery_Hero(22),
+	ATS_Laser_Battery_Hyperion(23),
+	ATA_Laser_Battery_Hyperion(24),
+	Flame_Thrower(25),
+	Flame_Thrower_Gui_Montag(26),
+	Arclite_Shock_Cannon(27),
+	Arclite_Shock_Cannon_Edmund_Duke(28),
+	Longbolt_Missile(29),
+	Yamato_Gun(30),
+	Nuclear_Strike(31),
+	Lockdown(32),
+	EMP_Shockwave(33),
+	Irradiate(34),
+	Claws(35),
+	Claws_Devouring_One(36),
+	Claws_Infested_Kerrigan(37),
+	Needle_Spines(38),
+	Needle_Spines_Hunter_Killer(39),
+	Kaiser_Blades(40),
+	Kaiser_Blades_Torrasque(41),
+	Toxic_Spores(42),
+	Spines(43),
+	Acid_Spore(46),
+	Acid_Spore_Kukulza(47),
+	Glave_Wurm(48),
+	Glave_Wurm_Kukulza(49),
+	Seeker_Spores(52),
+	Subterranean_Tentacle(53),
+	Suicide_Infested_Terran(54),
+	Suicide_Scourge(55),
+	Parasite(56),
+	Spawn_Broodlings(57),
+	Ensnare(58),
+	Dark_Swarm(59),
+	Plague(60),
+	Consume(61),
+	Particle_Beam(62),
+	Psi_Blades(64),
+	Psi_Blades_Fenix(65),
+	Phase_Disruptor(66),
+	Phase_Disruptor_Fenix(67),
+	Psi_Assault(69),
+	Psionic_Shockwave(70),
+	Psionic_Shockwave_TZ_Archon(71),
+	Dual_Photon_Blasters(73),
+	Anti_Matter_Missiles(74),
+	Dual_Photon_Blasters_Mojo(75),
+	Anti_Matter_Missiles_Mojo(76),
+	Phase_Disruptor_Cannon(77),
+	Phase_Disruptor_Cannon_Danimoth(78),
+	Pulse_Cannon(79),
+	STS_Photon_Cannon(80),
+	STA_Photon_Cannon(81),
+	Scarab(82),
+	Stasis_Field(83),
+	Psionic_Storm(84),
+	Warp_Blades_Zeratul(85),
+	Warp_Blades_Hero(86),
+	Platform_Laser_Battery(92),
+	Independant_Laser_Battery(93),
+	Twin_Autocannons_Floor_Trap(96),
+	Hellfire_Missile_Pack_Wall_Trap(97),
+	Flame_Thrower_Wall_Trap(98),
+	Hellfire_Missile_Pack_Floor_Trap(99),
+	Neutron_Flare(100),
+	Disruption_Web(101),
+	Restoration(102),
+	Halo_Rockets(103),
+	Corrosive_Acid(104),
+	Mind_Control(105),
+	Feedback(106),
+	Optical_Flare(107),
+	Maelstrom(108),
+	Subterranean_Spines(109),
+	Warp_Blades(111),
+	C_10_Canister_Rifle_Samir_Duran(112),
+	C_10_Canister_Rifle_Infested_Duran(113),
+	Dual_Photon_Blasters_Artanis(114),
+	Anti_Matter_Missiles_Artanis(115),
+	C_10_Canister_Rifle_Alexei_Stukov(116),
+	None(130),
+	Unknown(131);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/Error.java b/generated/bwapi/Error.java
new file mode 100644
index 0000000..e39eb7f
--- /dev/null
+++ b/generated/bwapi/Error.java
@@ -0,0 +1,96 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Error {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static Error Unit_Does_Not_Exist;
+
+    public static Error Unit_Not_Visible;
+
+    public static Error Unit_Not_Owned;
+
+    public static Error Unit_Busy;
+
+    public static Error Incompatible_UnitType;
+
+    public static Error Incompatible_TechType;
+
+    public static Error Incompatible_State;
+
+    public static Error Already_Researched;
+
+    public static Error Fully_Upgraded;
+
+    public static Error Currently_Researching;
+
+    public static Error Currently_Upgrading;
+
+    public static Error Insufficient_Minerals;
+
+    public static Error Insufficient_Gas;
+
+    public static Error Insufficient_Supply;
+
+    public static Error Insufficient_Energy;
+
+    public static Error Insufficient_Tech;
+
+    public static Error Insufficient_Ammo;
+
+    public static Error Insufficient_Space;
+
+    public static Error Invalid_Tile_Position;
+
+    public static Error Unbuildable_Location;
+
+    public static Error Unreachable_Location;
+
+    public static Error Out_Of_Range;
+
+    public static Error Unable_To_Hit;
+
+    public static Error Access_Denied;
+
+    public static Error File_Not_Found;
+
+    public static Error Invalid_Parameter;
+
+    public static Error None;
+
+    public static Error Unknown;
+
+
+    private static Map<Long, Error> instances = new HashMap<Long, Error>();
+
+    private Error(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Error get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Error instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Error(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Event.java b/generated/bwapi/Event.java
new file mode 100644
index 0000000..87c511e
--- /dev/null
+++ b/generated/bwapi/Event.java
@@ -0,0 +1,64 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Event {
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public String getText() {
+        return getText_native(pointer);
+    }
+
+    public Unit getUnit() {
+        return getUnit_native(pointer);
+    }
+
+    public Player getPlayer() {
+        return getPlayer_native(pointer);
+    }
+
+    public boolean isWinner() {
+        return isWinner_native(pointer);
+    }
+
+
+    private static Map<Long, Event> instances = new HashMap<Long, Event>();
+
+    private Event(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Event get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Event instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Event(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native Position getPosition_native(long pointer);
+
+    private native String getText_native(long pointer);
+
+    private native Unit getUnit_native(long pointer);
+
+    private native Player getPlayer_native(long pointer);
+
+    private native boolean isWinner_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/EventType/Enum.java b/generated/bwapi/EventType/Enum.java
new file mode 100644
index 0000000..b4fe4d9
--- /dev/null
+++ b/generated/bwapi/EventType/Enum.java
@@ -0,0 +1,41 @@
+package bwapi.EventType;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	MatchStart(0),
+	MatchEnd(1),
+	MatchFrame(2),
+	MenuFrame(3),
+	SendText(4),
+	ReceiveText(5),
+	PlayerLeft(6),
+	NukeDetect(7),
+	UnitDiscover(8),
+	UnitEvade(9),
+	UnitShow(10),
+	UnitHide(11),
+	UnitCreate(12),
+	UnitDestroy(13),
+	UnitMorph(14),
+	UnitRenegade(15),
+	SaveGame(16),
+	UnitComplete(17);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/ExplosionType.java b/generated/bwapi/ExplosionType.java
new file mode 100644
index 0000000..e47dc75
--- /dev/null
+++ b/generated/bwapi/ExplosionType.java
@@ -0,0 +1,90 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class ExplosionType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static ExplosionType None;
+
+    public static ExplosionType Normal;
+
+    public static ExplosionType Radial_Splash;
+
+    public static ExplosionType Enemy_Splash;
+
+    public static ExplosionType Lockdown;
+
+    public static ExplosionType Nuclear_Missile;
+
+    public static ExplosionType Parasite;
+
+    public static ExplosionType Broodlings;
+
+    public static ExplosionType EMP_Shockwave;
+
+    public static ExplosionType Irradiate;
+
+    public static ExplosionType Ensnare;
+
+    public static ExplosionType Plague;
+
+    public static ExplosionType Stasis_Field;
+
+    public static ExplosionType Dark_Swarm;
+
+    public static ExplosionType Consume;
+
+    public static ExplosionType Yamato_Gun;
+
+    public static ExplosionType Restoration;
+
+    public static ExplosionType Disruption_Web;
+
+    public static ExplosionType Corrosive_Acid;
+
+    public static ExplosionType Mind_Control;
+
+    public static ExplosionType Feedback;
+
+    public static ExplosionType Optical_Flare;
+
+    public static ExplosionType Maelstrom;
+
+    public static ExplosionType Air_Splash;
+
+    public static ExplosionType Unknown;
+
+
+    private static Map<Long, ExplosionType> instances = new HashMap<Long, ExplosionType>();
+
+    private ExplosionType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static ExplosionType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        ExplosionType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new ExplosionType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Flag/Enum.java b/generated/bwapi/Flag/Enum.java
new file mode 100644
index 0000000..6180b0b
--- /dev/null
+++ b/generated/bwapi/Flag/Enum.java
@@ -0,0 +1,25 @@
+package bwapi.Flag;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	CompleteMapInformation(0),
+	UserInput(1);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/Force.java b/generated/bwapi/Force.java
new file mode 100644
index 0000000..4ed88f2
--- /dev/null
+++ b/generated/bwapi/Force.java
@@ -0,0 +1,52 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Force {
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public String getName() {
+        return getName_native(pointer);
+    }
+
+    public List<Player> getPlayers() {
+        return getPlayers_native(pointer);
+    }
+
+
+    private static Map<Long, Force> instances = new HashMap<Long, Force>();
+
+    private Force(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Force get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Force instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Force(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native String getName_native(long pointer);
+
+    private native List<Player> getPlayers_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Forceset.java b/generated/bwapi/Forceset.java
new file mode 100644
index 0000000..7d2c0cf
--- /dev/null
+++ b/generated/bwapi/Forceset.java
@@ -0,0 +1,40 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Forceset {
+
+    public List<Player> getPlayers() {
+        return getPlayers_native(pointer);
+    }
+
+
+    private static Map<Long, Forceset> instances = new HashMap<Long, Forceset>();
+
+    private Forceset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Forceset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Forceset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Forceset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native List<Player> getPlayers_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Game.java b/generated/bwapi/Game.java
new file mode 100644
index 0000000..267af5e
--- /dev/null
+++ b/generated/bwapi/Game.java
@@ -0,0 +1,1330 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Game {
+
+    public List<Force> getForces() {
+        return getForces_native(pointer);
+    }
+
+    public List<Player> getPlayers() {
+        return getPlayers_native(pointer);
+    }
+
+    public List<Unit> getAllUnits() {
+        return getAllUnits_native(pointer);
+    }
+
+    public List<Unit> getMinerals() {
+        return getMinerals_native(pointer);
+    }
+
+    public List<Unit> getGeysers() {
+        return getGeysers_native(pointer);
+    }
+
+    public List<Unit> getNeutralUnits() {
+        return getNeutralUnits_native(pointer);
+    }
+
+    public List<Unit> getStaticMinerals() {
+        return getStaticMinerals_native(pointer);
+    }
+
+    public List<Unit> getStaticGeysers() {
+        return getStaticGeysers_native(pointer);
+    }
+
+    public List<Unit> getStaticNeutralUnits() {
+        return getStaticNeutralUnits_native(pointer);
+    }
+
+    public List<Bullet> getBullets() {
+        return getBullets_native(pointer);
+    }
+
+    public Force getForce(int forceID) {
+        return getForce_native(pointer, forceID);
+    }
+
+    public Player getPlayer(int playerID) {
+        return getPlayer_native(pointer, playerID);
+    }
+
+    public Unit getUnit(int unitID) {
+        return getUnit_native(pointer, unitID);
+    }
+
+    public Unit indexToUnit(int unitIndex) {
+        return indexToUnit_native(pointer, unitIndex);
+    }
+
+    public Region getRegion(int regionID) {
+        return getRegion_native(pointer, regionID);
+    }
+
+    public GameType getGameType() {
+        return getGameType_native(pointer);
+    }
+
+    public int getLatency() {
+        return getLatency_native(pointer);
+    }
+
+    public int getFrameCount() {
+        return getFrameCount_native(pointer);
+    }
+
+    public int getReplayFrameCount() {
+        return getReplayFrameCount_native(pointer);
+    }
+
+    public int getFPS() {
+        return getFPS_native(pointer);
+    }
+
+    public double getAverageFPS() {
+        return getAverageFPS_native(pointer);
+    }
+
+    public Position getMousePosition() {
+        return getMousePosition_native(pointer);
+    }
+
+    public boolean getMouseState(MouseButton button) {
+        return getMouseState_native(pointer, button);
+    }
+
+    public boolean getKeyState(Key key) {
+        return getKeyState_native(pointer, key);
+    }
+
+    public Position getScreenPosition() {
+        return getScreenPosition_native(pointer);
+    }
+
+    public void setScreenPosition(int x, int y) {
+        setScreenPosition_native(pointer, x, y);
+    }
+
+    public void setScreenPosition(Position p) {
+        setScreenPosition_native(pointer, p);
+    }
+
+    public void pingMinimap(int x, int y) {
+        pingMinimap_native(pointer, x, y);
+    }
+
+    public void pingMinimap(Position p) {
+        pingMinimap_native(pointer, p);
+    }
+
+    public boolean isFlagEnabled(int flag) {
+        return isFlagEnabled_native(pointer, flag);
+    }
+
+    public void enableFlag(int flag) {
+        enableFlag_native(pointer, flag);
+    }
+
+    public Error getLastError() {
+        return getLastError_native(pointer);
+    }
+
+    public boolean setLastError() {
+        return setLastError_native(pointer);
+    }
+
+    public boolean setLastError(Error e) {
+        return setLastError_native(pointer, e);
+    }
+
+    public int mapWidth() {
+        return mapWidth_native(pointer);
+    }
+
+    public int mapHeight() {
+        return mapHeight_native(pointer);
+    }
+
+    public String mapFileName() {
+        return mapFileName_native(pointer);
+    }
+
+    public String mapPathName() {
+        return mapPathName_native(pointer);
+    }
+
+    public String mapName() {
+        return mapName_native(pointer);
+    }
+
+    public String mapHash() {
+        return mapHash_native(pointer);
+    }
+
+    public boolean isWalkable(int walkX, int walkY) {
+        return isWalkable_native(pointer, walkX, walkY);
+    }
+
+    public boolean isWalkable(WalkPosition position) {
+        return isWalkable_native(pointer, position);
+    }
+
+    public int getGroundHeight(int tileX, int tileY) {
+        return getGroundHeight_native(pointer, tileX, tileY);
+    }
+
+    public int getGroundHeight(TilePosition position) {
+        return getGroundHeight_native(pointer, position);
+    }
+
+    public boolean isBuildable(int tileX, int tileY) {
+        return isBuildable_native(pointer, tileX, tileY);
+    }
+
+    public boolean isBuildable(int tileX, int tileY, boolean includeBuildings) {
+        return isBuildable_native(pointer, tileX, tileY, includeBuildings);
+    }
+
+    public boolean isBuildable(TilePosition position) {
+        return isBuildable_native(pointer, position);
+    }
+
+    public boolean isBuildable(TilePosition position, boolean includeBuildings) {
+        return isBuildable_native(pointer, position, includeBuildings);
+    }
+
+    public boolean isVisible(int tileX, int tileY) {
+        return isVisible_native(pointer, tileX, tileY);
+    }
+
+    public boolean isVisible(TilePosition position) {
+        return isVisible_native(pointer, position);
+    }
+
+    public boolean isExplored(int tileX, int tileY) {
+        return isExplored_native(pointer, tileX, tileY);
+    }
+
+    public boolean isExplored(TilePosition position) {
+        return isExplored_native(pointer, position);
+    }
+
+    public boolean hasCreep(int tileX, int tileY) {
+        return hasCreep_native(pointer, tileX, tileY);
+    }
+
+    public boolean hasCreep(TilePosition position) {
+        return hasCreep_native(pointer, position);
+    }
+
+    public boolean hasPowerPrecise(int x, int y) {
+        return hasPowerPrecise_native(pointer, x, y);
+    }
+
+    public boolean hasPowerPrecise(int x, int y, UnitType unitType) {
+        return hasPowerPrecise_native(pointer, x, y, unitType);
+    }
+
+    public boolean hasPowerPrecise(Position position) {
+        return hasPowerPrecise_native(pointer, position);
+    }
+
+    public boolean hasPowerPrecise(Position position, UnitType unitType) {
+        return hasPowerPrecise_native(pointer, position, unitType);
+    }
+
+    public boolean hasPower(int tileX, int tileY) {
+        return hasPower_native(pointer, tileX, tileY);
+    }
+
+    public boolean hasPower(int tileX, int tileY, UnitType unitType) {
+        return hasPower_native(pointer, tileX, tileY, unitType);
+    }
+
+    public boolean hasPower(TilePosition position) {
+        return hasPower_native(pointer, position);
+    }
+
+    public boolean hasPower(TilePosition position, UnitType unitType) {
+        return hasPower_native(pointer, position, unitType);
+    }
+
+    public boolean hasPower(int tileX, int tileY, int tileWidth, int tileHeight) {
+        return hasPower_native(pointer, tileX, tileY, tileWidth, tileHeight);
+    }
+
+    public boolean hasPower(int tileX, int tileY, int tileWidth, int tileHeight, UnitType unitType) {
+        return hasPower_native(pointer, tileX, tileY, tileWidth, tileHeight, unitType);
+    }
+
+    public boolean hasPower(TilePosition position, int tileWidth, int tileHeight) {
+        return hasPower_native(pointer, position, tileWidth, tileHeight);
+    }
+
+    public boolean hasPower(TilePosition position, int tileWidth, int tileHeight, UnitType unitType) {
+        return hasPower_native(pointer, position, tileWidth, tileHeight, unitType);
+    }
+
+    public boolean canBuildHere(TilePosition position, UnitType type, Unit builder) {
+        return canBuildHere_native(pointer, position, type, builder);
+    }
+
+    public boolean canBuildHere(TilePosition position, UnitType type) {
+        return canBuildHere_native(pointer, position, type);
+    }
+
+    public boolean canBuildHere(TilePosition position, UnitType type, Unit builder, boolean checkExplored) {
+        return canBuildHere_native(pointer, position, type, builder, checkExplored);
+    }
+
+    public boolean canMake(UnitType type) {
+        return canMake_native(pointer, type);
+    }
+
+    public boolean canMake(UnitType type, Unit builder) {
+        return canMake_native(pointer, type, builder);
+    }
+
+    public boolean canResearch(TechType type, Unit unit) {
+        return canResearch_native(pointer, type, unit);
+    }
+
+    public boolean canResearch(TechType type) {
+        return canResearch_native(pointer, type);
+    }
+
+    public boolean canResearch(TechType type, Unit unit, boolean checkCanIssueCommandType) {
+        return canResearch_native(pointer, type, unit, checkCanIssueCommandType);
+    }
+
+    public boolean canUpgrade(UpgradeType type, Unit unit) {
+        return canUpgrade_native(pointer, type, unit);
+    }
+
+    public boolean canUpgrade(UpgradeType type) {
+        return canUpgrade_native(pointer, type);
+    }
+
+    public boolean canUpgrade(UpgradeType type, Unit unit, boolean checkCanIssueCommandType) {
+        return canUpgrade_native(pointer, type, unit, checkCanIssueCommandType);
+    }
+
+    public void printf(String cstr_format) {
+        printf_native(pointer, cstr_format);
+    }
+
+    public void sendText(String cstr_format) {
+        sendText_native(pointer, cstr_format);
+    }
+
+    public void sendTextEx(boolean toAllies, String cstr_format) {
+        sendTextEx_native(pointer, toAllies, cstr_format);
+    }
+
+    public boolean isInGame() {
+        return isInGame_native(pointer);
+    }
+
+    public boolean isMultiplayer() {
+        return isMultiplayer_native(pointer);
+    }
+
+    public boolean isBattleNet() {
+        return isBattleNet_native(pointer);
+    }
+
+    public boolean isPaused() {
+        return isPaused_native(pointer);
+    }
+
+    public boolean isReplay() {
+        return isReplay_native(pointer);
+    }
+
+    public void pauseGame() {
+        pauseGame_native(pointer);
+    }
+
+    public void resumeGame() {
+        resumeGame_native(pointer);
+    }
+
+    public void leaveGame() {
+        leaveGame_native(pointer);
+    }
+
+    public void restartGame() {
+        restartGame_native(pointer);
+    }
+
+    public void setLocalSpeed(int speed) {
+        setLocalSpeed_native(pointer, speed);
+    }
+
+    public boolean issueCommand(List<Unit> units, UnitCommand command) {
+        return issueCommand_native(pointer, units, command);
+    }
+
+    public List<Unit> getSelectedUnits() {
+        return getSelectedUnits_native(pointer);
+    }
+
+    public Player self() {
+        return self_native(pointer);
+    }
+
+    public Player enemy() {
+        return enemy_native(pointer);
+    }
+
+    public Player neutral() {
+        return neutral_native(pointer);
+    }
+
+    public List<Player> allies() {
+        return allies_native(pointer);
+    }
+
+    public List<Player> enemies() {
+        return enemies_native(pointer);
+    }
+
+    public List<Player> observers() {
+        return observers_native(pointer);
+    }
+
+    public void setTextSize() {
+        setTextSize_native(pointer);
+    }
+
+    public void setTextSize(bwapi.Text.Size.Enum size) {
+        setTextSize_native(pointer, size);
+    }
+
+    public void drawText(bwapi.CoordinateType.Enum ctype, int x, int y, String cstr_format) {
+        drawText_native(pointer, ctype, x, y, cstr_format);
+    }
+
+    public void drawTextMap(int x, int y, String cstr_format) {
+        drawTextMap_native(pointer, x, y, cstr_format);
+    }
+
+    public void drawTextMap(Position p, String cstr_format) {
+        drawTextMap_native(pointer, p, cstr_format);
+    }
+
+    public void drawTextMouse(int x, int y, String cstr_format) {
+        drawTextMouse_native(pointer, x, y, cstr_format);
+    }
+
+    public void drawTextMouse(Position p, String cstr_format) {
+        drawTextMouse_native(pointer, p, cstr_format);
+    }
+
+    public void drawTextScreen(int x, int y, String cstr_format) {
+        drawTextScreen_native(pointer, x, y, cstr_format);
+    }
+
+    public void drawTextScreen(Position p, String cstr_format) {
+        drawTextScreen_native(pointer, p, cstr_format);
+    }
+
+    public void drawBox(bwapi.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color) {
+        drawBox_native(pointer, ctype, left, top, right, bottom, color);
+    }
+
+    public void drawBox(bwapi.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBox_native(pointer, ctype, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxMap(int left, int top, int right, int bottom, Color color) {
+        drawBoxMap_native(pointer, left, top, right, bottom, color);
+    }
+
+    public void drawBoxMap(int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBoxMap_native(pointer, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxMap(Position leftTop, Position rightBottom, Color color) {
+        drawBoxMap_native(pointer, leftTop, rightBottom, color);
+    }
+
+    public void drawBoxMap(Position leftTop, Position rightBottom, Color color, boolean isSolid) {
+        drawBoxMap_native(pointer, leftTop, rightBottom, color, isSolid);
+    }
+
+    public void drawBoxMouse(int left, int top, int right, int bottom, Color color) {
+        drawBoxMouse_native(pointer, left, top, right, bottom, color);
+    }
+
+    public void drawBoxMouse(int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBoxMouse_native(pointer, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxMouse(Position leftTop, Position rightBottom, Color color) {
+        drawBoxMouse_native(pointer, leftTop, rightBottom, color);
+    }
+
+    public void drawBoxMouse(Position leftTop, Position rightBottom, Color color, boolean isSolid) {
+        drawBoxMouse_native(pointer, leftTop, rightBottom, color, isSolid);
+    }
+
+    public void drawBoxScreen(int left, int top, int right, int bottom, Color color) {
+        drawBoxScreen_native(pointer, left, top, right, bottom, color);
+    }
+
+    public void drawBoxScreen(int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBoxScreen_native(pointer, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxScreen(Position leftTop, Position rightBottom, Color color) {
+        drawBoxScreen_native(pointer, leftTop, rightBottom, color);
+    }
+
+    public void drawBoxScreen(Position leftTop, Position rightBottom, Color color, boolean isSolid) {
+        drawBoxScreen_native(pointer, leftTop, rightBottom, color, isSolid);
+    }
+
+    public void drawTriangle(bwapi.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangle_native(pointer, ctype, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangle(bwapi.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangle_native(pointer, ctype, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleMap(int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangleMap_native(pointer, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangleMap(int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangleMap_native(pointer, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleMap(Position a, Position b, Position c, Color color) {
+        drawTriangleMap_native(pointer, a, b, c, color);
+    }
+
+    public void drawTriangleMap(Position a, Position b, Position c, Color color, boolean isSolid) {
+        drawTriangleMap_native(pointer, a, b, c, color, isSolid);
+    }
+
+    public void drawTriangleMouse(int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangleMouse_native(pointer, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangleMouse(int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangleMouse_native(pointer, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleMouse(Position a, Position b, Position c, Color color) {
+        drawTriangleMouse_native(pointer, a, b, c, color);
+    }
+
+    public void drawTriangleMouse(Position a, Position b, Position c, Color color, boolean isSolid) {
+        drawTriangleMouse_native(pointer, a, b, c, color, isSolid);
+    }
+
+    public void drawTriangleScreen(int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangleScreen_native(pointer, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangleScreen(int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangleScreen_native(pointer, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleScreen(Position a, Position b, Position c, Color color) {
+        drawTriangleScreen_native(pointer, a, b, c, color);
+    }
+
+    public void drawTriangleScreen(Position a, Position b, Position c, Color color, boolean isSolid) {
+        drawTriangleScreen_native(pointer, a, b, c, color, isSolid);
+    }
+
+    public void drawCircle(bwapi.CoordinateType.Enum ctype, int x, int y, int radius, Color color) {
+        drawCircle_native(pointer, ctype, x, y, radius, color);
+    }
+
+    public void drawCircle(bwapi.CoordinateType.Enum ctype, int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircle_native(pointer, ctype, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleMap(int x, int y, int radius, Color color) {
+        drawCircleMap_native(pointer, x, y, radius, color);
+    }
+
+    public void drawCircleMap(int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircleMap_native(pointer, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleMap(Position p, int radius, Color color) {
+        drawCircleMap_native(pointer, p, radius, color);
+    }
+
+    public void drawCircleMap(Position p, int radius, Color color, boolean isSolid) {
+        drawCircleMap_native(pointer, p, radius, color, isSolid);
+    }
+
+    public void drawCircleMouse(int x, int y, int radius, Color color) {
+        drawCircleMouse_native(pointer, x, y, radius, color);
+    }
+
+    public void drawCircleMouse(int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircleMouse_native(pointer, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleMouse(Position p, int radius, Color color) {
+        drawCircleMouse_native(pointer, p, radius, color);
+    }
+
+    public void drawCircleMouse(Position p, int radius, Color color, boolean isSolid) {
+        drawCircleMouse_native(pointer, p, radius, color, isSolid);
+    }
+
+    public void drawCircleScreen(int x, int y, int radius, Color color) {
+        drawCircleScreen_native(pointer, x, y, radius, color);
+    }
+
+    public void drawCircleScreen(int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircleScreen_native(pointer, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleScreen(Position p, int radius, Color color) {
+        drawCircleScreen_native(pointer, p, radius, color);
+    }
+
+    public void drawCircleScreen(Position p, int radius, Color color, boolean isSolid) {
+        drawCircleScreen_native(pointer, p, radius, color, isSolid);
+    }
+
+    public void drawEllipse(bwapi.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color) {
+        drawEllipse_native(pointer, ctype, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipse(bwapi.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipse_native(pointer, ctype, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMap(int x, int y, int xrad, int yrad, Color color) {
+        drawEllipseMap_native(pointer, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipseMap(int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMap_native(pointer, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMap(Position p, int xrad, int yrad, Color color) {
+        drawEllipseMap_native(pointer, p, xrad, yrad, color);
+    }
+
+    public void drawEllipseMap(Position p, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMap_native(pointer, p, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMouse(int x, int y, int xrad, int yrad, Color color) {
+        drawEllipseMouse_native(pointer, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipseMouse(int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMouse_native(pointer, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMouse(Position p, int xrad, int yrad, Color color) {
+        drawEllipseMouse_native(pointer, p, xrad, yrad, color);
+    }
+
+    public void drawEllipseMouse(Position p, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMouse_native(pointer, p, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseScreen(int x, int y, int xrad, int yrad, Color color) {
+        drawEllipseScreen_native(pointer, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipseScreen(int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseScreen_native(pointer, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseScreen(Position p, int xrad, int yrad, Color color) {
+        drawEllipseScreen_native(pointer, p, xrad, yrad, color);
+    }
+
+    public void drawEllipseScreen(Position p, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseScreen_native(pointer, p, xrad, yrad, color, isSolid);
+    }
+
+    public void drawDot(bwapi.CoordinateType.Enum ctype, int x, int y, Color color) {
+        drawDot_native(pointer, ctype, x, y, color);
+    }
+
+    public void drawDotMap(int x, int y, Color color) {
+        drawDotMap_native(pointer, x, y, color);
+    }
+
+    public void drawDotMap(Position p, Color color) {
+        drawDotMap_native(pointer, p, color);
+    }
+
+    public void drawDotMouse(int x, int y, Color color) {
+        drawDotMouse_native(pointer, x, y, color);
+    }
+
+    public void drawDotMouse(Position p, Color color) {
+        drawDotMouse_native(pointer, p, color);
+    }
+
+    public void drawDotScreen(int x, int y, Color color) {
+        drawDotScreen_native(pointer, x, y, color);
+    }
+
+    public void drawDotScreen(Position p, Color color) {
+        drawDotScreen_native(pointer, p, color);
+    }
+
+    public void drawLine(bwapi.CoordinateType.Enum ctype, int x1, int y1, int x2, int y2, Color color) {
+        drawLine_native(pointer, ctype, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineMap(int x1, int y1, int x2, int y2, Color color) {
+        drawLineMap_native(pointer, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineMap(Position a, Position b, Color color) {
+        drawLineMap_native(pointer, a, b, color);
+    }
+
+    public void drawLineMouse(int x1, int y1, int x2, int y2, Color color) {
+        drawLineMouse_native(pointer, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineMouse(Position a, Position b, Color color) {
+        drawLineMouse_native(pointer, a, b, color);
+    }
+
+    public void drawLineScreen(int x1, int y1, int x2, int y2, Color color) {
+        drawLineScreen_native(pointer, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineScreen(Position a, Position b, Color color) {
+        drawLineScreen_native(pointer, a, b, color);
+    }
+
+    public int getLatencyFrames() {
+        return getLatencyFrames_native(pointer);
+    }
+
+    public int getLatencyTime() {
+        return getLatencyTime_native(pointer);
+    }
+
+    public int getRemainingLatencyFrames() {
+        return getRemainingLatencyFrames_native(pointer);
+    }
+
+    public int getRemainingLatencyTime() {
+        return getRemainingLatencyTime_native(pointer);
+    }
+
+    public int getRevision() {
+        return getRevision_native(pointer);
+    }
+
+    public boolean isDebug() {
+        return isDebug_native(pointer);
+    }
+
+    public boolean isLatComEnabled() {
+        return isLatComEnabled_native(pointer);
+    }
+
+    public void setLatCom(boolean isEnabled) {
+        setLatCom_native(pointer, isEnabled);
+    }
+
+    public boolean isGUIEnabled() {
+        return isGUIEnabled_native(pointer);
+    }
+
+    public void setGUI(boolean enabled) {
+        setGUI_native(pointer, enabled);
+    }
+
+    public int getInstanceNumber() {
+        return getInstanceNumber_native(pointer);
+    }
+
+    public int getAPM() {
+        return getAPM_native(pointer);
+    }
+
+    public int getAPM(boolean includeSelects) {
+        return getAPM_native(pointer, includeSelects);
+    }
+
+    public boolean setMap(String cstr_mapFileName) {
+        return setMap_native(pointer, cstr_mapFileName);
+    }
+
+    public void setFrameSkip(int frameSkip) {
+        setFrameSkip_native(pointer, frameSkip);
+    }
+
+    public boolean hasPath(Position source, Position destination) {
+        return hasPath_native(pointer, source, destination);
+    }
+
+    public boolean setAlliance(Player player, boolean allied) {
+        return setAlliance_native(pointer, player, allied);
+    }
+
+    public boolean setAlliance(Player player) {
+        return setAlliance_native(pointer, player);
+    }
+
+    public boolean setAlliance(Player player, boolean allied, boolean alliedVictory) {
+        return setAlliance_native(pointer, player, allied, alliedVictory);
+    }
+
+    public boolean setVision(Player player) {
+        return setVision_native(pointer, player);
+    }
+
+    public boolean setVision(Player player, boolean enabled) {
+        return setVision_native(pointer, player, enabled);
+    }
+
+    public int elapsedTime() {
+        return elapsedTime_native(pointer);
+    }
+
+    public void setCommandOptimizationLevel(int level) {
+        setCommandOptimizationLevel_native(pointer, level);
+    }
+
+    public int countdownTimer() {
+        return countdownTimer_native(pointer);
+    }
+
+    public List<Region> getAllRegions() {
+        return getAllRegions_native(pointer);
+    }
+
+    public Region getRegionAt(int x, int y) {
+        return getRegionAt_native(pointer, x, y);
+    }
+
+    public Region getRegionAt(Position position) {
+        return getRegionAt_native(pointer, position);
+    }
+
+    public int getLastEventTime() {
+        return getLastEventTime_native(pointer);
+    }
+
+    public boolean setRevealAll() {
+        return setRevealAll_native(pointer);
+    }
+
+    public boolean setRevealAll(boolean reveal) {
+        return setRevealAll_native(pointer, reveal);
+    }
+
+    public TilePosition getBuildLocation(UnitType type, TilePosition desiredPosition, int maxRange) {
+        return getBuildLocation_native(pointer, type, desiredPosition, maxRange);
+    }
+
+    public TilePosition getBuildLocation(UnitType type, TilePosition desiredPosition) {
+        return getBuildLocation_native(pointer, type, desiredPosition);
+    }
+
+    public TilePosition getBuildLocation(UnitType type, TilePosition desiredPosition, int maxRange, boolean creep) {
+        return getBuildLocation_native(pointer, type, desiredPosition, maxRange, creep);
+    }
+
+    public int getDamageFrom(UnitType fromType, UnitType toType, Player fromPlayer) {
+        return getDamageFrom_native(pointer, fromType, toType, fromPlayer);
+    }
+
+    public int getDamageFrom(UnitType fromType, UnitType toType) {
+        return getDamageFrom_native(pointer, fromType, toType);
+    }
+
+    public int getDamageFrom(UnitType fromType, UnitType toType, Player fromPlayer, Player toPlayer) {
+        return getDamageFrom_native(pointer, fromType, toType, fromPlayer, toPlayer);
+    }
+
+    public int getDamageTo(UnitType toType, UnitType fromType, Player toPlayer) {
+        return getDamageTo_native(pointer, toType, fromType, toPlayer);
+    }
+
+    public int getDamageTo(UnitType toType, UnitType fromType) {
+        return getDamageTo_native(pointer, toType, fromType);
+    }
+
+    public int getDamageTo(UnitType toType, UnitType fromType, Player toPlayer, Player fromPlayer) {
+        return getDamageTo_native(pointer, toType, fromType, toPlayer, fromPlayer);
+    }
+
+
+    private static Map<Long, Game> instances = new HashMap<Long, Game>();
+
+    private Game(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Game get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Game instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Game(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native List<Force> getForces_native(long pointer);
+
+    private native List<Player> getPlayers_native(long pointer);
+
+    private native List<Unit> getAllUnits_native(long pointer);
+
+    private native List<Unit> getMinerals_native(long pointer);
+
+    private native List<Unit> getGeysers_native(long pointer);
+
+    private native List<Unit> getNeutralUnits_native(long pointer);
+
+    private native List<Unit> getStaticMinerals_native(long pointer);
+
+    private native List<Unit> getStaticGeysers_native(long pointer);
+
+    private native List<Unit> getStaticNeutralUnits_native(long pointer);
+
+    private native List<Bullet> getBullets_native(long pointer);
+
+    private native Force getForce_native(long pointer, int forceID);
+
+    private native Player getPlayer_native(long pointer, int playerID);
+
+    private native Unit getUnit_native(long pointer, int unitID);
+
+    private native Unit indexToUnit_native(long pointer, int unitIndex);
+
+    private native Region getRegion_native(long pointer, int regionID);
+
+    private native GameType getGameType_native(long pointer);
+
+    private native int getLatency_native(long pointer);
+
+    private native int getFrameCount_native(long pointer);
+
+    private native int getReplayFrameCount_native(long pointer);
+
+    private native int getFPS_native(long pointer);
+
+    private native double getAverageFPS_native(long pointer);
+
+    private native Position getMousePosition_native(long pointer);
+
+    private native boolean getMouseState_native(long pointer, MouseButton button);
+
+    private native boolean getKeyState_native(long pointer, Key key);
+
+    private native Position getScreenPosition_native(long pointer);
+
+    private native void setScreenPosition_native(long pointer, int x, int y);
+
+    private native void setScreenPosition_native(long pointer, Position p);
+
+    private native void pingMinimap_native(long pointer, int x, int y);
+
+    private native void pingMinimap_native(long pointer, Position p);
+
+    private native boolean isFlagEnabled_native(long pointer, int flag);
+
+    private native void enableFlag_native(long pointer, int flag);
+
+    private native Error getLastError_native(long pointer);
+
+    private native boolean setLastError_native(long pointer);
+
+    private native boolean setLastError_native(long pointer, Error e);
+
+    private native int mapWidth_native(long pointer);
+
+    private native int mapHeight_native(long pointer);
+
+    private native String mapFileName_native(long pointer);
+
+    private native String mapPathName_native(long pointer);
+
+    private native String mapName_native(long pointer);
+
+    private native String mapHash_native(long pointer);
+
+    private native boolean isWalkable_native(long pointer, int walkX, int walkY);
+
+    private native boolean isWalkable_native(long pointer, WalkPosition position);
+
+    private native int getGroundHeight_native(long pointer, int tileX, int tileY);
+
+    private native int getGroundHeight_native(long pointer, TilePosition position);
+
+    private native boolean isBuildable_native(long pointer, int tileX, int tileY);
+
+    private native boolean isBuildable_native(long pointer, int tileX, int tileY, boolean includeBuildings);
+
+    private native boolean isBuildable_native(long pointer, TilePosition position);
+
+    private native boolean isBuildable_native(long pointer, TilePosition position, boolean includeBuildings);
+
+    private native boolean isVisible_native(long pointer, int tileX, int tileY);
+
+    private native boolean isVisible_native(long pointer, TilePosition position);
+
+    private native boolean isExplored_native(long pointer, int tileX, int tileY);
+
+    private native boolean isExplored_native(long pointer, TilePosition position);
+
+    private native boolean hasCreep_native(long pointer, int tileX, int tileY);
+
+    private native boolean hasCreep_native(long pointer, TilePosition position);
+
+    private native boolean hasPowerPrecise_native(long pointer, int x, int y);
+
+    private native boolean hasPowerPrecise_native(long pointer, int x, int y, UnitType unitType);
+
+    private native boolean hasPowerPrecise_native(long pointer, Position position);
+
+    private native boolean hasPowerPrecise_native(long pointer, Position position, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, TilePosition position);
+
+    private native boolean hasPower_native(long pointer, TilePosition position, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY, int tileWidth, int tileHeight);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY, int tileWidth, int tileHeight, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, TilePosition position, int tileWidth, int tileHeight);
+
+    private native boolean hasPower_native(long pointer, TilePosition position, int tileWidth, int tileHeight, UnitType unitType);
+
+    private native boolean canBuildHere_native(long pointer, TilePosition position, UnitType type, Unit builder);
+
+    private native boolean canBuildHere_native(long pointer, TilePosition position, UnitType type);
+
+    private native boolean canBuildHere_native(long pointer, TilePosition position, UnitType type, Unit builder, boolean checkExplored);
+
+    private native boolean canMake_native(long pointer, UnitType type);
+
+    private native boolean canMake_native(long pointer, UnitType type, Unit builder);
+
+    private native boolean canResearch_native(long pointer, TechType type, Unit unit);
+
+    private native boolean canResearch_native(long pointer, TechType type);
+
+    private native boolean canResearch_native(long pointer, TechType type, Unit unit, boolean checkCanIssueCommandType);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type, Unit unit);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type, Unit unit, boolean checkCanIssueCommandType);
+
+    private native void printf_native(long pointer, String cstr_format);
+
+    private native void sendText_native(long pointer, String cstr_format);
+
+    private native void sendTextEx_native(long pointer, boolean toAllies, String cstr_format);
+
+    private native boolean isInGame_native(long pointer);
+
+    private native boolean isMultiplayer_native(long pointer);
+
+    private native boolean isBattleNet_native(long pointer);
+
+    private native boolean isPaused_native(long pointer);
+
+    private native boolean isReplay_native(long pointer);
+
+    private native void pauseGame_native(long pointer);
+
+    private native void resumeGame_native(long pointer);
+
+    private native void leaveGame_native(long pointer);
+
+    private native void restartGame_native(long pointer);
+
+    private native void setLocalSpeed_native(long pointer, int speed);
+
+    private native boolean issueCommand_native(long pointer, List<Unit> units, UnitCommand command);
+
+    private native List<Unit> getSelectedUnits_native(long pointer);
+
+    private native Player self_native(long pointer);
+
+    private native Player enemy_native(long pointer);
+
+    private native Player neutral_native(long pointer);
+
+    private native List<Player> allies_native(long pointer);
+
+    private native List<Player> enemies_native(long pointer);
+
+    private native List<Player> observers_native(long pointer);
+
+    private native void setTextSize_native(long pointer);
+
+    private native void setTextSize_native(long pointer, bwapi.Text.Size.Enum size);
+
+    private native void drawText_native(long pointer, bwapi.CoordinateType.Enum ctype, int x, int y, String cstr_format);
+
+    private native void drawTextMap_native(long pointer, int x, int y, String cstr_format);
+
+    private native void drawTextMap_native(long pointer, Position p, String cstr_format);
+
+    private native void drawTextMouse_native(long pointer, int x, int y, String cstr_format);
+
+    private native void drawTextMouse_native(long pointer, Position p, String cstr_format);
+
+    private native void drawTextScreen_native(long pointer, int x, int y, String cstr_format);
+
+    private native void drawTextScreen_native(long pointer, Position p, String cstr_format);
+
+    private native void drawBox_native(long pointer, bwapi.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBox_native(long pointer, bwapi.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxMap_native(long pointer, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBoxMap_native(long pointer, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxMap_native(long pointer, Position leftTop, Position rightBottom, Color color);
+
+    private native void drawBoxMap_native(long pointer, Position leftTop, Position rightBottom, Color color, boolean isSolid);
+
+    private native void drawBoxMouse_native(long pointer, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBoxMouse_native(long pointer, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxMouse_native(long pointer, Position leftTop, Position rightBottom, Color color);
+
+    private native void drawBoxMouse_native(long pointer, Position leftTop, Position rightBottom, Color color, boolean isSolid);
+
+    private native void drawBoxScreen_native(long pointer, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBoxScreen_native(long pointer, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxScreen_native(long pointer, Position leftTop, Position rightBottom, Color color);
+
+    private native void drawBoxScreen_native(long pointer, Position leftTop, Position rightBottom, Color color, boolean isSolid);
+
+    private native void drawTriangle_native(long pointer, bwapi.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangle_native(long pointer, bwapi.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleMap_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangleMap_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleMap_native(long pointer, Position a, Position b, Position c, Color color);
+
+    private native void drawTriangleMap_native(long pointer, Position a, Position b, Position c, Color color, boolean isSolid);
+
+    private native void drawTriangleMouse_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangleMouse_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleMouse_native(long pointer, Position a, Position b, Position c, Color color);
+
+    private native void drawTriangleMouse_native(long pointer, Position a, Position b, Position c, Color color, boolean isSolid);
+
+    private native void drawTriangleScreen_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangleScreen_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleScreen_native(long pointer, Position a, Position b, Position c, Color color);
+
+    private native void drawTriangleScreen_native(long pointer, Position a, Position b, Position c, Color color, boolean isSolid);
+
+    private native void drawCircle_native(long pointer, bwapi.CoordinateType.Enum ctype, int x, int y, int radius, Color color);
+
+    private native void drawCircle_native(long pointer, bwapi.CoordinateType.Enum ctype, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMap_native(long pointer, int x, int y, int radius, Color color);
+
+    private native void drawCircleMap_native(long pointer, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMap_native(long pointer, Position p, int radius, Color color);
+
+    private native void drawCircleMap_native(long pointer, Position p, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMouse_native(long pointer, int x, int y, int radius, Color color);
+
+    private native void drawCircleMouse_native(long pointer, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMouse_native(long pointer, Position p, int radius, Color color);
+
+    private native void drawCircleMouse_native(long pointer, Position p, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleScreen_native(long pointer, int x, int y, int radius, Color color);
+
+    private native void drawCircleScreen_native(long pointer, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleScreen_native(long pointer, Position p, int radius, Color color);
+
+    private native void drawCircleScreen_native(long pointer, Position p, int radius, Color color, boolean isSolid);
+
+    private native void drawEllipse_native(long pointer, bwapi.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipse_native(long pointer, bwapi.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMap_native(long pointer, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMap_native(long pointer, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMap_native(long pointer, Position p, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMap_native(long pointer, Position p, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMouse_native(long pointer, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMouse_native(long pointer, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMouse_native(long pointer, Position p, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMouse_native(long pointer, Position p, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseScreen_native(long pointer, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipseScreen_native(long pointer, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseScreen_native(long pointer, Position p, int xrad, int yrad, Color color);
+
+    private native void drawEllipseScreen_native(long pointer, Position p, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawDot_native(long pointer, bwapi.CoordinateType.Enum ctype, int x, int y, Color color);
+
+    private native void drawDotMap_native(long pointer, int x, int y, Color color);
+
+    private native void drawDotMap_native(long pointer, Position p, Color color);
+
+    private native void drawDotMouse_native(long pointer, int x, int y, Color color);
+
+    private native void drawDotMouse_native(long pointer, Position p, Color color);
+
+    private native void drawDotScreen_native(long pointer, int x, int y, Color color);
+
+    private native void drawDotScreen_native(long pointer, Position p, Color color);
+
+    private native void drawLine_native(long pointer, bwapi.CoordinateType.Enum ctype, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineMap_native(long pointer, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineMap_native(long pointer, Position a, Position b, Color color);
+
+    private native void drawLineMouse_native(long pointer, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineMouse_native(long pointer, Position a, Position b, Color color);
+
+    private native void drawLineScreen_native(long pointer, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineScreen_native(long pointer, Position a, Position b, Color color);
+
+    private native int getLatencyFrames_native(long pointer);
+
+    private native int getLatencyTime_native(long pointer);
+
+    private native int getRemainingLatencyFrames_native(long pointer);
+
+    private native int getRemainingLatencyTime_native(long pointer);
+
+    private native int getRevision_native(long pointer);
+
+    private native boolean isDebug_native(long pointer);
+
+    private native boolean isLatComEnabled_native(long pointer);
+
+    private native void setLatCom_native(long pointer, boolean isEnabled);
+
+    private native boolean isGUIEnabled_native(long pointer);
+
+    private native void setGUI_native(long pointer, boolean enabled);
+
+    private native int getInstanceNumber_native(long pointer);
+
+    private native int getAPM_native(long pointer);
+
+    private native int getAPM_native(long pointer, boolean includeSelects);
+
+    private native boolean setMap_native(long pointer, String cstr_mapFileName);
+
+    private native void setFrameSkip_native(long pointer, int frameSkip);
+
+    private native boolean hasPath_native(long pointer, Position source, Position destination);
+
+    private native boolean setAlliance_native(long pointer, Player player, boolean allied);
+
+    private native boolean setAlliance_native(long pointer, Player player);
+
+    private native boolean setAlliance_native(long pointer, Player player, boolean allied, boolean alliedVictory);
+
+    private native boolean setVision_native(long pointer, Player player);
+
+    private native boolean setVision_native(long pointer, Player player, boolean enabled);
+
+    private native int elapsedTime_native(long pointer);
+
+    private native void setCommandOptimizationLevel_native(long pointer, int level);
+
+    private native int countdownTimer_native(long pointer);
+
+    private native List<Region> getAllRegions_native(long pointer);
+
+    private native Region getRegionAt_native(long pointer, int x, int y);
+
+    private native Region getRegionAt_native(long pointer, Position position);
+
+    private native int getLastEventTime_native(long pointer);
+
+    private native boolean setRevealAll_native(long pointer);
+
+    private native boolean setRevealAll_native(long pointer, boolean reveal);
+
+    private native TilePosition getBuildLocation_native(long pointer, UnitType type, TilePosition desiredPosition, int maxRange);
+
+    private native TilePosition getBuildLocation_native(long pointer, UnitType type, TilePosition desiredPosition);
+
+    private native TilePosition getBuildLocation_native(long pointer, UnitType type, TilePosition desiredPosition, int maxRange, boolean creep);
+
+    private native int getDamageFrom_native(long pointer, UnitType fromType, UnitType toType, Player fromPlayer);
+
+    private native int getDamageFrom_native(long pointer, UnitType fromType, UnitType toType);
+
+    private native int getDamageFrom_native(long pointer, UnitType fromType, UnitType toType, Player fromPlayer, Player toPlayer);
+
+    private native int getDamageTo_native(long pointer, UnitType toType, UnitType fromType, Player toPlayer);
+
+    private native int getDamageTo_native(long pointer, UnitType toType, UnitType fromType);
+
+    private native int getDamageTo_native(long pointer, UnitType toType, UnitType fromType, Player toPlayer, Player fromPlayer);
+
+
+}
diff --git a/generated/bwapi/GameType.java b/generated/bwapi/GameType.java
new file mode 100644
index 0000000..8dab11d
--- /dev/null
+++ b/generated/bwapi/GameType.java
@@ -0,0 +1,70 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class GameType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static GameType Melee;
+
+    public static GameType Free_For_All;
+
+    public static GameType One_on_One;
+
+    public static GameType Capture_The_Flag;
+
+    public static GameType Greed;
+
+    public static GameType Slaughter;
+
+    public static GameType Sudden_Death;
+
+    public static GameType Ladder;
+
+    public static GameType Use_Map_Settings;
+
+    public static GameType Team_Melee;
+
+    public static GameType Team_Free_For_All;
+
+    public static GameType Team_Capture_The_Flag;
+
+    public static GameType Top_vs_Bottom;
+
+    public static GameType None;
+
+    public static GameType Unknown;
+
+
+    private static Map<Long, GameType> instances = new HashMap<Long, GameType>();
+
+    private GameType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static GameType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        GameType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new GameType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Key.java b/generated/bwapi/Key.java
new file mode 100644
index 0000000..9d39538
--- /dev/null
+++ b/generated/bwapi/Key.java
@@ -0,0 +1,251 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Key {
+
+	K_LBUTTON(1),
+	K_RBUTTON(2),
+	K_CANCEL(3),
+	K_MBUTTON(4),
+	K_XBUTTON1(5),
+	K_XBUTTON2(6),
+	__UNDEFINED_7(7),
+	K_BACK(8),
+	K_TAB(9),
+	__RESERVED_A(10),
+	__RESERVED_B(11),
+	K_CLEAR(12),
+	K_RETURN(13),
+	__UNDEFINED_E(14),
+	__UNDEFINED_F(15),
+	K_SHIFT(16),
+	K_CONTROL(17),
+	K_MENU(18),
+	K_PAUSE(19),
+	K_CAPITAL(20),
+	K_KANA(21),
+	K_UNDEFINED_16(22),
+	K_JUNJA(23),
+	K_FINAL(24),
+	K_KANJI(25),
+	__UNDEFINED_1A(26),
+	K_ESCAPE(27),
+	K_CONVERT(28),
+	K_NONCONVERT(29),
+	K_ACCEPT(30),
+	K_MODECHANGE(31),
+	K_SPACE(32),
+	K_PRIOR(33),
+	K_NEXT(34),
+	K_END(35),
+	K_HOME(36),
+	K_LEFT(37),
+	K_UP(38),
+	K_RIGHT(39),
+	K_DOWN(40),
+	K_SELECT(41),
+	K_PRINT(42),
+	K_EXECUTE(43),
+	K_SNAPSHOT(44),
+	K_INSERT(45),
+	K_DELETE(46),
+	K_HELP(47),
+	K_0(48),
+	K_1(49),
+	K_2(50),
+	K_3(51),
+	K_4(52),
+	K_5(53),
+	K_6(54),
+	K_7(55),
+	K_8(56),
+	K_9(57),
+	__UNDEFINED_3A(58),
+	__UNDEFINED_3B(59),
+	__UNDEFINED_3C(60),
+	__UNDEFINED_3D(61),
+	__UNDEFINED_3E(62),
+	__UNDEFINED_3F(63),
+	__UNDEFINED_40(64),
+	K_A(65),
+	K_B(66),
+	K_C(67),
+	K_D(68),
+	K_E(69),
+	K_F(70),
+	K_G(71),
+	K_H(72),
+	K_I(73),
+	K_J(74),
+	K_K(75),
+	K_L(76),
+	K_M(77),
+	K_N(78),
+	K_O(79),
+	K_P(80),
+	K_Q(81),
+	K_R(82),
+	K_S(83),
+	K_T(84),
+	K_U(85),
+	K_V(86),
+	K_W(87),
+	K_X(88),
+	K_Y(89),
+	K_Z(90),
+	K_LWIN(91),
+	K_RWIN(92),
+	K_APPS(93),
+	__RESERVED_5E(94),
+	K_SLEEP(95),
+	K_NUMPAD0(96),
+	K_NUMPAD1(97),
+	K_NUMPAD2(98),
+	K_NUMPAD3(99),
+	K_NUMPAD4(100),
+	K_NUMPAD5(101),
+	K_NUMPAD6(102),
+	K_NUMPAD7(103),
+	K_NUMPAD8(104),
+	K_NUMPAD9(105),
+	K_MULTIPLY(106),
+	K_ADD(107),
+	K_SEPARATOR(108),
+	K_SUBTRACT(109),
+	K_DECIMAL(110),
+	K_DIVIDE(111),
+	K_F1(112),
+	K_F2(113),
+	K_F3(114),
+	K_F4(115),
+	K_F5(116),
+	K_F6(117),
+	K_F7(118),
+	K_F8(119),
+	K_F9(120),
+	K_F10(121),
+	K_F11(122),
+	K_F12(123),
+	K_F13(124),
+	K_F14(125),
+	K_F15(126),
+	K_F16(127),
+	K_F17(128),
+	K_F18(129),
+	K_F19(130),
+	K_F20(131),
+	K_F21(132),
+	K_F22(133),
+	K_F23(134),
+	K_F24(135),
+	__UNASSIGNED_88(136),
+	__UNASSIGNED_89(137),
+	__UNASSIGNED_8A(138),
+	__UNASSIGNED_8B(139),
+	__UNASSIGNED_8C(140),
+	__UNASSIGNED_8D(141),
+	__UNASSIGNED_8E(142),
+	__UNASSIGNED_8F(143),
+	K_NUMLOCK(144),
+	K_SCROLL(145),
+	K_OEM_NEC_EQUAL(146),
+	K_OEM_FJ_JISHO(147),
+	K_OEM_FJ_MASSHOU(148),
+	K_OEM_FJ_TOUROKU(149),
+	K_OEM_FJ_LOYA(150),
+	__UNASSIGNED_97(151),
+	__UNASSIGNED_98(152),
+	__UNASSIGNED_99(153),
+	__UNASSIGNED_9A(154),
+	__UNASSIGNED_9B(155),
+	__UNASSIGNED_9C(156),
+	__UNASSIGNED_9D(157),
+	__UNASSIGNED_9E(158),
+	__UNASSIGNED_9F(159),
+	K_LSHIFT(160),
+	K_RSHIFT(161),
+	K_LCONTROL(162),
+	K_RCONTROL(163),
+	K_LMENU(164),
+	K_RMENU(165),
+	K_BROWSER_BACK(166),
+	K_BROWSER_FORWARD(167),
+	K_BROWSER_REFRESH(168),
+	K_BROWSER_STOP(169),
+	K_BROWSER_SEARCH(170),
+	K_BROWSER_FAVORITES(171),
+	K_BROWSER_HOME(172),
+	K_VOLUME_MUTE(173),
+	K_VOLUME_DOWN(174),
+	K_VOLUME_UP(175),
+	K_MEDIA_NEXT_TRACK(176),
+	K_MEDIA_PREV_TRACK(177),
+	K_MEDIA_STOP(178),
+	K_MEDIA_PLAY_PAUSE(179),
+	K_LAUNCH_MAIL(180),
+	K_LAUNCH_MEDIA_SELECT(181),
+	K_LAUNCH_APP1(182),
+	K_LAUNCH_APP2(183),
+	__RESERVED_B8(184),
+	__RESERVED_B9(185),
+	K_OEM_1(186),
+	K_OEM_PLUS(187),
+	K_OEM_COMMA(188),
+	K_OEM_MINUS(189),
+	K_OEM_PERIOD(190),
+	K_OEM_2(191),
+	K_OEM_3(192),
+	K_OEM_4(219),
+	K_OEM_5(220),
+	K_OEM_6(221),
+	K_OEM_7(222),
+	K_OEM_8(223),
+	__RESERVED_E0(224),
+	K_OEM_AX(225),
+	K_OEM_102(226),
+	K_ICO_HELP(227),
+	K_ICO_00(228),
+	K_PROCESSKEY(229),
+	K_ICO_CLEAR(230),
+	K_PACKET(231),
+	__UNASSIGNED_E8(232),
+	K_OEM_RESET(233),
+	K_OEM_JUMP(234),
+	K_OEM_PA1(235),
+	K_OEM_PA2(236),
+	K_OEM_PA3(237),
+	K_OEM_WSCTRL(238),
+	K_OEM_CUSEL(239),
+	K_OEM_ATTN(240),
+	K_OEM_FINISH(241),
+	K_OEM_COPY(242),
+	K_OEM_AUTO(243),
+	K_OEM_ENLW(244),
+	K_OEM_BACKTAB(245),
+	K_ATTN(246),
+	K_CRSEL(247),
+	K_EXSEL(248),
+	K_EREOF(249),
+	K_PLAY(250),
+	K_ZOOM(251),
+	K_NONAME(252),
+	K_PA1(253),
+	K_OEM_CLEAR(254);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Key(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/Latency/Enum.java b/generated/bwapi/Latency/Enum.java
new file mode 100644
index 0000000..e7fe434
--- /dev/null
+++ b/generated/bwapi/Latency/Enum.java
@@ -0,0 +1,29 @@
+package bwapi.Latency;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	SinglePlayer(2),
+	LanLow(5),
+	LanMedium(7),
+	LanHigh(9),
+	BattlenetLow(14),
+	BattlenetMedium(19);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/Mirror.java b/generated/bwapi/Mirror.java
new file mode 100644
index 0000000..0132272
--- /dev/null
+++ b/generated/bwapi/Mirror.java
@@ -0,0 +1,262 @@
+package bwapi;
+
+import bwapi.AIModule;
+import bwapi.BWEventListener;
+
+import java.io.*;
+import java.io.File;
+import java.lang.Exception;
+import java.lang.UnsupportedOperationException;
+import java.util.*;
+import java.util.zip.*;
+
+/**
+ * <p>The API entry point. Standard use case:</p>
+ * <ul>
+ *     <li>Create a Mirror object and use {@link #getModule()} and then set an {@link AIModule}'s {@link BWEventListener}<br/>
+ *     <li>Call {@link #startGame()} to init the API and connect to Broodwar, then launch Broodwar from ChaosLauncher.</li>
+ *     <li>In you {@link BWEventListener#onStart()} method, receive the Game object by calling {@link #getGame()}</li>
+ * </ul>
+ * <br/>
+ * <b>Example</b>
+ * <pre>
+ *     {@code
+ *
+ *     mirror.getModule().setEventListener(new DefaultBWListener()
+ *     {
+ *            public void onStart() {
+ *                game = mirror.getGame();
+ *                self = game.self();
+ *                //initialization
+ *                ....
+ *            }
+ *
+ *           public void onUpdate() {
+ *               for (Unit myUnit : self.getUnits()) {
+ *                   //give orders to unit
+ *                   ...
+ *                }
+ *           }
+ *        });
+ *     }
+ *     mirror.startGame();
+ * </pre>
+
+ * <p><b>Note:</b> The Game object is initialized during the {@link #startGame()} as well as other BWMirror API's constants.
+ * Do not use any API releated methods/fields prior to {@link #startGame()}.</p>
+
+ */
+public class Mirror {
+
+    private Game game;
+
+    private AIModule module = new AIModule();
+
+    private FrameCallback frameCallback;
+
+    private static final boolean EXTRACT_JAR = true;
+
+    private static final String VERSION = "2_0";
+
+    static {
+        String arch = System.getProperty("os.arch");
+        String dllNames[] = {"bwapi_bridge" + VERSION};
+        if(!arch.equals("x86")){
+            throw new UnsupportedOperationException("BWMirror API supports only x86 architecture.");
+        }
+        try {
+            if (EXTRACT_JAR) {
+                System.setProperty("java.library.path", ".");
+                java.lang.reflect.Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
+                fieldSysPath.setAccessible(true);
+                fieldSysPath.set(null, null);
+
+                String path = Mirror.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+                String decodedPath = java.net.URLDecoder.decode(path, "UTF-8");
+
+                for (String dllName : dllNames) {
+                    String dllNameExt = dllName + ".dll";
+                    if (!new File(dllNameExt).exists()) {
+                        JarResources jar = new JarResources(path);
+                        byte[] correctDllData = jar.getResource(dllNameExt);
+                        FileOutputStream funnyStream = new FileOutputStream(dllNameExt);
+                        funnyStream.write(correctDllData);
+                        funnyStream.close();
+                    }
+                }
+            }
+        } catch (Exception e) {
+            System.err.println("Failed to extract native libraries.\n" + e);
+        }
+
+        System.loadLibrary(dllNames[0]);
+
+        File dataDir = new File("bwapi-data/BWTA");
+        if(!dataDir.exists()){
+            try {
+                dataDir.mkdirs();
+            } catch (Exception e) {
+                System.err.println("Unable to create /bwapi-data/BWTA folder, BWTA analysis will not be saved.");
+            }
+        }
+    }
+
+    public Game getGame() {
+        return game;
+    }
+
+    public AIModule getModule() {
+        return module;
+    }
+
+    /**
+     * Starts the API, initializes all constants ( {@link UnitType}, {@link WeaponType} ) and the {@link Game} object.
+     * This method blocks until the end of game.
+     */
+    public native void startGame();
+
+    private void update() {
+        if (frameCallback != null) {
+            frameCallback.update();
+        }
+    }
+
+    /*public void setFrameCallback(bwapi.Mirror.FrameCallback frameCallback) {
+        this.frameCallback = frameCallback;
+    } */
+
+    /**
+     * The simplest interface to receive update event from Broodwar. The {@link #update()} method is called once each frame.
+     * For a simple bot and implementation of this interface is enough, to receive all in game events, implement {@link BWEventListener}.
+     */
+    /*public*/ private interface FrameCallback {
+        public void update();
+    }
+
+    @SuppressWarnings({"unchecked"})
+    private static class JarResources {
+
+        // external debug flag
+        public boolean debugOn = false;
+
+        // jar resource mapping tables
+        private Hashtable htSizes = new Hashtable();
+        private Hashtable htJarContents = new Hashtable();
+
+        // a jar file
+        private String jarFileName;
+
+        /**
+         * creates a javabot.JarResources. It extracts all resources from a Jar
+         * into an internal hashtable, keyed by resource names.
+         *
+         * @param jarFileName a jar or zip file
+         */
+        public JarResources(String jarFileName) {
+            this.jarFileName = jarFileName;
+            init();
+        }
+
+        /**
+         * Extracts a jar resource as a blob.
+         *
+         * @param name a resource name.
+         */
+        public byte[] getResource(String name) {
+            return (byte[]) htJarContents.get(name);
+        }
+
+        /**
+         * initializes internal hash tables with Jar file resources.
+         */
+        private void init() {
+            try {
+                // extracts just sizes only.
+                ZipFile zf = new ZipFile(jarFileName);
+                Enumeration e = zf.entries();
+                while (e.hasMoreElements()) {
+                    ZipEntry ze = (ZipEntry) e.nextElement();
+                    if (debugOn) {
+                        System.out.println(dumpZipEntry(ze));
+                    }
+                    htSizes.put(ze.getName(), new Integer((int) ze.getSize()));
+                }
+                zf.close();
+
+                // extract resources and put them into the hashtable.
+                FileInputStream fis = new FileInputStream(jarFileName);
+                BufferedInputStream bis = new BufferedInputStream(fis);
+                ZipInputStream zis = new ZipInputStream(bis);
+                ZipEntry ze = null;
+                while ((ze = zis.getNextEntry()) != null) {
+                    if (ze.isDirectory()) {
+                        continue;
+                    }
+                    if (debugOn) {
+                        System.out.println(
+                                "ze.getName()=" + ze.getName() + "," + "getSize()=" + ze.getSize()
+                        );
+                    }
+                    int size = (int) ze.getSize();
+                    // -1 means unknown size.
+                    if (size == -1) {
+                        size = ((Integer) htSizes.get(ze.getName())).intValue();
+                    }
+                    byte[] b = new byte[(int) size];
+                    int rb = 0;
+                    int chunk = 0;
+                    while (((int) size - rb) > 0) {
+                        chunk = zis.read(b, rb, (int) size - rb);
+                        if (chunk == -1) {
+                            break;
+                        }
+                        rb += chunk;
+                    }
+                    // add to internal resource hashtable
+                    htJarContents.put(ze.getName(), b);
+                    if (debugOn) {
+                        System.out.println(
+                                ze.getName() + "  rb=" + rb +
+                                        ",size=" + size +
+                                        ",csize=" + ze.getCompressedSize()
+                        );
+                    }
+                }
+            } catch (NullPointerException e) {
+                System.out.println("done.");
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        /**
+         * Dumps a zip entry into a string.
+         *
+         * @param ze a ZipEntry
+         */
+        private String dumpZipEntry(ZipEntry ze) {
+            StringBuffer sb = new StringBuffer();
+            if (ze.isDirectory()) {
+                sb.append("d ");
+            } else {
+                sb.append("f ");
+            }
+            if (ze.getMethod() == ZipEntry.STORED) {
+                sb.append("stored   ");
+            } else {
+                sb.append("defalted ");
+            }
+            sb.append(ze.getName());
+            sb.append("\t");
+            sb.append("" + ze.getSize());
+            if (ze.getMethod() == ZipEntry.DEFLATED) {
+                sb.append("/" + ze.getCompressedSize());
+            }
+            return (sb.toString());
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/MouseButton.java b/generated/bwapi/MouseButton.java
new file mode 100644
index 0000000..a312ca3
--- /dev/null
+++ b/generated/bwapi/MouseButton.java
@@ -0,0 +1,27 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum MouseButton {
+
+	M_LEFT(0),
+	M_RIGHT(1),
+	M_MIDDLE(2),
+	M_MAX(3);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	MouseButton(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/Order.java b/generated/bwapi/Order.java
new file mode 100644
index 0000000..1641c59
--- /dev/null
+++ b/generated/bwapi/Order.java
@@ -0,0 +1,346 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Order {
+
+    public static Order Die;
+
+    public static Order Stop;
+
+    public static Order Guard;
+
+    public static Order PlayerGuard;
+
+    public static Order TurretGuard;
+
+    public static Order BunkerGuard;
+
+    public static Order Move;
+
+    public static Order AttackUnit;
+
+    public static Order AttackTile;
+
+    public static Order Hover;
+
+    public static Order AttackMove;
+
+    public static Order InfestedCommandCenter;
+
+    public static Order UnusedNothing;
+
+    public static Order UnusedPowerup;
+
+    public static Order TowerGuard;
+
+    public static Order VultureMine;
+
+    public static Order Nothing;
+
+    public static Order CastInfestation;
+
+    public static Order InfestingCommandCenter;
+
+    public static Order PlaceBuilding;
+
+    public static Order CreateProtossBuilding;
+
+    public static Order ConstructingBuilding;
+
+    public static Order Repair;
+
+    public static Order PlaceAddon;
+
+    public static Order BuildAddon;
+
+    public static Order Train;
+
+    public static Order RallyPointUnit;
+
+    public static Order RallyPointTile;
+
+    public static Order ZergBirth;
+
+    public static Order ZergUnitMorph;
+
+    public static Order ZergBuildingMorph;
+
+    public static Order IncompleteBuilding;
+
+    public static Order BuildNydusExit;
+
+    public static Order EnterNydusCanal;
+
+    public static Order Follow;
+
+    public static Order Carrier;
+
+    public static Order ReaverCarrierMove;
+
+    public static Order CarrierIgnore2;
+
+    public static Order Reaver;
+
+    public static Order TrainFighter;
+
+    public static Order InterceptorAttack;
+
+    public static Order ScarabAttack;
+
+    public static Order RechargeShieldsUnit;
+
+    public static Order RechargeShieldsBattery;
+
+    public static Order ShieldBattery;
+
+    public static Order InterceptorReturn;
+
+    public static Order BuildingLand;
+
+    public static Order BuildingLiftOff;
+
+    public static Order DroneLiftOff;
+
+    public static Order LiftingOff;
+
+    public static Order ResearchTech;
+
+    public static Order Upgrade;
+
+    public static Order Larva;
+
+    public static Order SpawningLarva;
+
+    public static Order Harvest1;
+
+    public static Order Harvest2;
+
+    public static Order MoveToGas;
+
+    public static Order WaitForGas;
+
+    public static Order HarvestGas;
+
+    public static Order ReturnGas;
+
+    public static Order MoveToMinerals;
+
+    public static Order WaitForMinerals;
+
+    public static Order MiningMinerals;
+
+    public static Order Harvest3;
+
+    public static Order Harvest4;
+
+    public static Order ReturnMinerals;
+
+    public static Order Interrupted;
+
+    public static Order EnterTransport;
+
+    public static Order PickupIdle;
+
+    public static Order PickupTransport;
+
+    public static Order PickupBunker;
+
+    public static Order Pickup4;
+
+    public static Order PowerupIdle;
+
+    public static Order Sieging;
+
+    public static Order Unsieging;
+
+    public static Order InitCreepGrowth;
+
+    public static Order SpreadCreep;
+
+    public static Order StoppingCreepGrowth;
+
+    public static Order GuardianAspect;
+
+    public static Order ArchonWarp;
+
+    public static Order CompletingArchonSummon;
+
+    public static Order HoldPosition;
+
+    public static Order Cloak;
+
+    public static Order Decloak;
+
+    public static Order Unload;
+
+    public static Order MoveUnload;
+
+    public static Order FireYamatoGun;
+
+    public static Order CastLockdown;
+
+    public static Order Burrowing;
+
+    public static Order Burrowed;
+
+    public static Order Unburrowing;
+
+    public static Order CastDarkSwarm;
+
+    public static Order CastParasite;
+
+    public static Order CastSpawnBroodlings;
+
+    public static Order CastEMPShockwave;
+
+    public static Order NukeWait;
+
+    public static Order NukeTrain;
+
+    public static Order NukeLaunch;
+
+    public static Order NukePaint;
+
+    public static Order NukeUnit;
+
+    public static Order CastNuclearStrike;
+
+    public static Order NukeTrack;
+
+    public static Order CloakNearbyUnits;
+
+    public static Order PlaceMine;
+
+    public static Order RightClickAction;
+
+    public static Order CastRecall;
+
+    public static Order Teleport;
+
+    public static Order CastScannerSweep;
+
+    public static Order Scanner;
+
+    public static Order CastDefensiveMatrix;
+
+    public static Order CastPsionicStorm;
+
+    public static Order CastIrradiate;
+
+    public static Order CastPlague;
+
+    public static Order CastConsume;
+
+    public static Order CastEnsnare;
+
+    public static Order CastStasisField;
+
+    public static Order CastHallucination;
+
+    public static Order Hallucination2;
+
+    public static Order ResetCollision;
+
+    public static Order Patrol;
+
+    public static Order CTFCOPInit;
+
+    public static Order CTFCOPStarted;
+
+    public static Order CTFCOP2;
+
+    public static Order ComputerAI;
+
+    public static Order AtkMoveEP;
+
+    public static Order HarassMove;
+
+    public static Order AIPatrol;
+
+    public static Order GuardPost;
+
+    public static Order RescuePassive;
+
+    public static Order Neutral;
+
+    public static Order ComputerReturn;
+
+    public static Order SelfDestructing;
+
+    public static Order Critter;
+
+    public static Order HiddenGun;
+
+    public static Order OpenDoor;
+
+    public static Order CloseDoor;
+
+    public static Order HideTrap;
+
+    public static Order RevealTrap;
+
+    public static Order EnableDoodad;
+
+    public static Order DisableDoodad;
+
+    public static Order WarpIn;
+
+    public static Order Medic;
+
+    public static Order MedicHeal;
+
+    public static Order HealMove;
+
+    public static Order MedicHealToIdle;
+
+    public static Order CastRestoration;
+
+    public static Order CastDisruptionWeb;
+
+    public static Order CastMindControl;
+
+    public static Order DarkArchonMeld;
+
+    public static Order CastFeedback;
+
+    public static Order CastOpticalFlare;
+
+    public static Order CastMaelstrom;
+
+    public static Order JunkYardDog;
+
+    public static Order Fatal;
+
+    public static Order None;
+
+    public static Order Unknown;
+
+
+    private static Map<Long, Order> instances = new HashMap<Long, Order>();
+
+    private Order(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Order get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Order instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Order(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi/Player.java b/generated/bwapi/Player.java
new file mode 100644
index 0000000..c67a3c4
--- /dev/null
+++ b/generated/bwapi/Player.java
@@ -0,0 +1,400 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Player {
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public String getName() {
+        return getName_native(pointer);
+    }
+
+    public List<Unit> getUnits() {
+        return getUnits_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public PlayerType getType() {
+        return getType_native(pointer);
+    }
+
+    public Force getForce() {
+        return getForce_native(pointer);
+    }
+
+    public boolean isAlly(Player player) {
+        return isAlly_native(pointer, player);
+    }
+
+    public boolean isEnemy(Player player) {
+        return isEnemy_native(pointer, player);
+    }
+
+    public boolean isNeutral() {
+        return isNeutral_native(pointer);
+    }
+
+    public TilePosition getStartLocation() {
+        return getStartLocation_native(pointer);
+    }
+
+    public boolean isVictorious() {
+        return isVictorious_native(pointer);
+    }
+
+    public boolean isDefeated() {
+        return isDefeated_native(pointer);
+    }
+
+    public boolean leftGame() {
+        return leftGame_native(pointer);
+    }
+
+    public int minerals() {
+        return minerals_native(pointer);
+    }
+
+    public int gas() {
+        return gas_native(pointer);
+    }
+
+    public int gatheredMinerals() {
+        return gatheredMinerals_native(pointer);
+    }
+
+    public int gatheredGas() {
+        return gatheredGas_native(pointer);
+    }
+
+    public int repairedMinerals() {
+        return repairedMinerals_native(pointer);
+    }
+
+    public int repairedGas() {
+        return repairedGas_native(pointer);
+    }
+
+    public int refundedMinerals() {
+        return refundedMinerals_native(pointer);
+    }
+
+    public int refundedGas() {
+        return refundedGas_native(pointer);
+    }
+
+    public int spentMinerals() {
+        return spentMinerals_native(pointer);
+    }
+
+    public int spentGas() {
+        return spentGas_native(pointer);
+    }
+
+    public int supplyTotal() {
+        return supplyTotal_native(pointer);
+    }
+
+    public int supplyTotal(Race race) {
+        return supplyTotal_native(pointer, race);
+    }
+
+    public int supplyUsed() {
+        return supplyUsed_native(pointer);
+    }
+
+    public int supplyUsed(Race race) {
+        return supplyUsed_native(pointer, race);
+    }
+
+    public int allUnitCount() {
+        return allUnitCount_native(pointer);
+    }
+
+    public int allUnitCount(UnitType unit) {
+        return allUnitCount_native(pointer, unit);
+    }
+
+    public int visibleUnitCount() {
+        return visibleUnitCount_native(pointer);
+    }
+
+    public int visibleUnitCount(UnitType unit) {
+        return visibleUnitCount_native(pointer, unit);
+    }
+
+    public int completedUnitCount() {
+        return completedUnitCount_native(pointer);
+    }
+
+    public int completedUnitCount(UnitType unit) {
+        return completedUnitCount_native(pointer, unit);
+    }
+
+    public int incompleteUnitCount() {
+        return incompleteUnitCount_native(pointer);
+    }
+
+    public int incompleteUnitCount(UnitType unit) {
+        return incompleteUnitCount_native(pointer, unit);
+    }
+
+    public int deadUnitCount() {
+        return deadUnitCount_native(pointer);
+    }
+
+    public int deadUnitCount(UnitType unit) {
+        return deadUnitCount_native(pointer, unit);
+    }
+
+    public int killedUnitCount() {
+        return killedUnitCount_native(pointer);
+    }
+
+    public int killedUnitCount(UnitType unit) {
+        return killedUnitCount_native(pointer, unit);
+    }
+
+    public int getUpgradeLevel(UpgradeType upgrade) {
+        return getUpgradeLevel_native(pointer, upgrade);
+    }
+
+    public boolean hasResearched(TechType tech) {
+        return hasResearched_native(pointer, tech);
+    }
+
+    public boolean isResearching(TechType tech) {
+        return isResearching_native(pointer, tech);
+    }
+
+    public boolean isUpgrading(UpgradeType upgrade) {
+        return isUpgrading_native(pointer, upgrade);
+    }
+
+    public Color getColor() {
+        return getColor_native(pointer);
+    }
+
+    public char getTextColor() {
+        return getTextColor_native(pointer);
+    }
+
+    public int maxEnergy(UnitType unit) {
+        return maxEnergy_native(pointer, unit);
+    }
+
+    public double topSpeed(UnitType unit) {
+        return topSpeed_native(pointer, unit);
+    }
+
+    public int weaponMaxRange(WeaponType weapon) {
+        return weaponMaxRange_native(pointer, weapon);
+    }
+
+    public int sightRange(UnitType unit) {
+        return sightRange_native(pointer, unit);
+    }
+
+    public int weaponDamageCooldown(UnitType unit) {
+        return weaponDamageCooldown_native(pointer, unit);
+    }
+
+    public int armor(UnitType unit) {
+        return armor_native(pointer, unit);
+    }
+
+    public int damage(WeaponType wpn) {
+        return damage_native(pointer, wpn);
+    }
+
+    public int getUnitScore() {
+        return getUnitScore_native(pointer);
+    }
+
+    public int getKillScore() {
+        return getKillScore_native(pointer);
+    }
+
+    public int getBuildingScore() {
+        return getBuildingScore_native(pointer);
+    }
+
+    public int getRazingScore() {
+        return getRazingScore_native(pointer);
+    }
+
+    public int getCustomScore() {
+        return getCustomScore_native(pointer);
+    }
+
+    public boolean isObserver() {
+        return isObserver_native(pointer);
+    }
+
+    public int getMaxUpgradeLevel(UpgradeType upgrade) {
+        return getMaxUpgradeLevel_native(pointer, upgrade);
+    }
+
+    public boolean isResearchAvailable(TechType tech) {
+        return isResearchAvailable_native(pointer, tech);
+    }
+
+    public boolean isUnitAvailable(UnitType unit) {
+        return isUnitAvailable_native(pointer, unit);
+    }
+
+
+    private static Map<Long, Player> instances = new HashMap<Long, Player>();
+
+    private Player(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Player get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Player instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Player(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native String getName_native(long pointer);
+
+    private native List<Unit> getUnits_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native PlayerType getType_native(long pointer);
+
+    private native Force getForce_native(long pointer);
+
+    private native boolean isAlly_native(long pointer, Player player);
+
+    private native boolean isEnemy_native(long pointer, Player player);
+
+    private native boolean isNeutral_native(long pointer);
+
+    private native TilePosition getStartLocation_native(long pointer);
+
+    private native boolean isVictorious_native(long pointer);
+
+    private native boolean isDefeated_native(long pointer);
+
+    private native boolean leftGame_native(long pointer);
+
+    private native int minerals_native(long pointer);
+
+    private native int gas_native(long pointer);
+
+    private native int gatheredMinerals_native(long pointer);
+
+    private native int gatheredGas_native(long pointer);
+
+    private native int repairedMinerals_native(long pointer);
+
+    private native int repairedGas_native(long pointer);
+
+    private native int refundedMinerals_native(long pointer);
+
+    private native int refundedGas_native(long pointer);
+
+    private native int spentMinerals_native(long pointer);
+
+    private native int spentGas_native(long pointer);
+
+    private native int supplyTotal_native(long pointer);
+
+    private native int supplyTotal_native(long pointer, Race race);
+
+    private native int supplyUsed_native(long pointer);
+
+    private native int supplyUsed_native(long pointer, Race race);
+
+    private native int allUnitCount_native(long pointer);
+
+    private native int allUnitCount_native(long pointer, UnitType unit);
+
+    private native int visibleUnitCount_native(long pointer);
+
+    private native int visibleUnitCount_native(long pointer, UnitType unit);
+
+    private native int completedUnitCount_native(long pointer);
+
+    private native int completedUnitCount_native(long pointer, UnitType unit);
+
+    private native int incompleteUnitCount_native(long pointer);
+
+    private native int incompleteUnitCount_native(long pointer, UnitType unit);
+
+    private native int deadUnitCount_native(long pointer);
+
+    private native int deadUnitCount_native(long pointer, UnitType unit);
+
+    private native int killedUnitCount_native(long pointer);
+
+    private native int killedUnitCount_native(long pointer, UnitType unit);
+
+    private native int getUpgradeLevel_native(long pointer, UpgradeType upgrade);
+
+    private native boolean hasResearched_native(long pointer, TechType tech);
+
+    private native boolean isResearching_native(long pointer, TechType tech);
+
+    private native boolean isUpgrading_native(long pointer, UpgradeType upgrade);
+
+    private native Color getColor_native(long pointer);
+
+    private native char getTextColor_native(long pointer);
+
+    private native int maxEnergy_native(long pointer, UnitType unit);
+
+    private native double topSpeed_native(long pointer, UnitType unit);
+
+    private native int weaponMaxRange_native(long pointer, WeaponType weapon);
+
+    private native int sightRange_native(long pointer, UnitType unit);
+
+    private native int weaponDamageCooldown_native(long pointer, UnitType unit);
+
+    private native int armor_native(long pointer, UnitType unit);
+
+    private native int damage_native(long pointer, WeaponType wpn);
+
+    private native int getUnitScore_native(long pointer);
+
+    private native int getKillScore_native(long pointer);
+
+    private native int getBuildingScore_native(long pointer);
+
+    private native int getRazingScore_native(long pointer);
+
+    private native int getCustomScore_native(long pointer);
+
+    private native boolean isObserver_native(long pointer);
+
+    private native int getMaxUpgradeLevel_native(long pointer, UpgradeType upgrade);
+
+    private native boolean isResearchAvailable_native(long pointer, TechType tech);
+
+    private native boolean isUnitAvailable_native(long pointer, UnitType unit);
+
+
+}
diff --git a/generated/bwapi/PlayerType.java b/generated/bwapi/PlayerType.java
new file mode 100644
index 0000000..f8bd7e8
--- /dev/null
+++ b/generated/bwapi/PlayerType.java
@@ -0,0 +1,74 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class PlayerType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public boolean isLobbyType() {
+        return isLobbyType_native(pointer);
+    }
+
+    public boolean isGameType() {
+        return isGameType_native(pointer);
+    }
+
+    public static PlayerType None;
+
+    public static PlayerType Computer;
+
+    public static PlayerType Player;
+
+    public static PlayerType RescuePassive;
+
+    public static PlayerType EitherPreferComputer;
+
+    public static PlayerType EitherPreferHuman;
+
+    public static PlayerType Neutral;
+
+    public static PlayerType Closed;
+
+    public static PlayerType PlayerLeft;
+
+    public static PlayerType ComputerLeft;
+
+    public static PlayerType Unknown;
+
+
+    private static Map<Long, PlayerType> instances = new HashMap<Long, PlayerType>();
+
+    private PlayerType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static PlayerType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        PlayerType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new PlayerType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native boolean isLobbyType_native(long pointer);
+
+    private native boolean isGameType_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Playerset.java b/generated/bwapi/Playerset.java
new file mode 100644
index 0000000..0e4b2a5
--- /dev/null
+++ b/generated/bwapi/Playerset.java
@@ -0,0 +1,58 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Playerset {
+
+    public List<Unit> getUnits() {
+        return getUnits_native(pointer);
+    }
+
+    public void setAlliance(boolean allies) {
+        setAlliance_native(pointer, allies);
+    }
+
+    public void setAlliance() {
+        setAlliance_native(pointer);
+    }
+
+    public void setAlliance(boolean allies, boolean alliedVictory) {
+        setAlliance_native(pointer, allies, alliedVictory);
+    }
+
+
+    private static Map<Long, Playerset> instances = new HashMap<Long, Playerset>();
+
+    private Playerset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Playerset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Playerset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Playerset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native List<Unit> getUnits_native(long pointer);
+
+    private native void setAlliance_native(long pointer, boolean allies);
+
+    private native void setAlliance_native(long pointer);
+
+    private native void setAlliance_native(long pointer, boolean allies, boolean alliedVictory);
+
+
+}
diff --git a/generated/bwapi/Position.java b/generated/bwapi/Position.java
new file mode 100644
index 0000000..3955987
--- /dev/null
+++ b/generated/bwapi/Position.java
@@ -0,0 +1,86 @@
+package bwapi;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Positions are measured in pixels and are the highest resolution.
+ */
+public class Position extends AbstractPoint<Position>{
+
+    private int x, y;
+
+    public Position(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public String toString() {
+        return "[" + x + ", " + y + "]";
+    }
+
+    public native boolean isValid();
+
+    public native Position makeValid();
+
+    public native int getApproxDistance(Position position);
+
+    public native double getLength();
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public static Position Invalid;
+
+    public static Position None;
+
+    public static Position Unknown;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Position)) return false;
+
+        Position position = (Position) o;
+
+        if (x != position.x) return false;
+        if (y != position.y) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x;
+        result = 31 * result + y;
+        return result;
+    }
+
+
+    private static Map<Long, Position> instances = new HashMap<Long, Position>();
+
+    private Position(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Position get(long pointer) {
+        Position instance = instances.get(pointer);
+        if (instance == null) {
+            instance = new Position(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    public Position getPoint(){
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/PositionOrUnit.java b/generated/bwapi/PositionOrUnit.java
new file mode 100644
index 0000000..c0da66a
--- /dev/null
+++ b/generated/bwapi/PositionOrUnit.java
@@ -0,0 +1,55 @@
+package bwapi;
+
+import java.lang.IllegalArgumentException;
+import java.lang.Object;
+import java.lang.Override;
+
+public class PositionOrUnit {
+
+    private Unit unit;
+
+    private Position position;
+
+    public PositionOrUnit(Unit unit){
+        if(unit == null){
+            throw new IllegalArgumentException("PositionOrUnit must not reference null!");
+        };
+        this.unit = unit;
+    }
+
+    public PositionOrUnit(Position position){
+        if(position == null){
+            throw new IllegalArgumentException("PositionOrUnit must not reference null!");
+        };
+        this.position = position;
+    }
+
+    public Unit getUnit(){
+        return unit;
+    }
+
+    public Position getPosition() {
+        return position;
+    }
+
+    public boolean isUnit(){
+        return unit != null;
+    }
+
+    public boolean isPosition(){
+        return position != null;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof PositionOrUnit)) return false;
+
+        PositionOrUnit that = (PositionOrUnit) o;
+
+        if (position != null ? !position.equals(that.position) : that.position != null) return false;
+        if (unit != null ? !unit.equals(that.unit) : that.unit != null) return false;
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/PositionedObject.java b/generated/bwapi/PositionedObject.java
new file mode 100644
index 0000000..4d40575
--- /dev/null
+++ b/generated/bwapi/PositionedObject.java
@@ -0,0 +1,15 @@
+package bwapi;
+
+import bwapi.Position;
+
+/**
+ * Interrmediate class used to translate getPoint() calls to getPosition() calls.
+ */
+public abstract class PositionedObject extends AbstractPoint<Position> {
+
+    public Position getPoint(){
+        return getPosition();
+    }
+
+    public abstract Position getPosition();
+}
\ No newline at end of file
diff --git a/generated/bwapi/Race.java b/generated/bwapi/Race.java
new file mode 100644
index 0000000..2f4b2a4
--- /dev/null
+++ b/generated/bwapi/Race.java
@@ -0,0 +1,82 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Race {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public UnitType getWorker() {
+        return getWorker_native(pointer);
+    }
+
+    public UnitType getCenter() {
+        return getCenter_native(pointer);
+    }
+
+    public UnitType getRefinery() {
+        return getRefinery_native(pointer);
+    }
+
+    public UnitType getTransport() {
+        return getTransport_native(pointer);
+    }
+
+    public UnitType getSupplyProvider() {
+        return getSupplyProvider_native(pointer);
+    }
+
+    public static Race Zerg;
+
+    public static Race Terran;
+
+    public static Race Protoss;
+
+    public static Race Random;
+
+    public static Race None;
+
+    public static Race Unknown;
+
+
+    private static Map<Long, Race> instances = new HashMap<Long, Race>();
+
+    private Race(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Race get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Race instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Race(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native UnitType getWorker_native(long pointer);
+
+    private native UnitType getCenter_native(long pointer);
+
+    private native UnitType getRefinery_native(long pointer);
+
+    private native UnitType getTransport_native(long pointer);
+
+    private native UnitType getSupplyProvider_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Region.java b/generated/bwapi/Region.java
new file mode 100644
index 0000000..a66d6e3
--- /dev/null
+++ b/generated/bwapi/Region.java
@@ -0,0 +1,120 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+import bwapi.CenteredObject;
+
+public class Region extends CenteredObject 
+{
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public int getRegionGroupID() {
+        return getRegionGroupID_native(pointer);
+    }
+
+    public Position getCenter() {
+        return getCenter_native(pointer);
+    }
+
+    public boolean isHigherGround() {
+        return isHigherGround_native(pointer);
+    }
+
+    public int getDefensePriority() {
+        return getDefensePriority_native(pointer);
+    }
+
+    public boolean isAccessible() {
+        return isAccessible_native(pointer);
+    }
+
+    public List<Region> getNeighbors() {
+        return getNeighbors_native(pointer);
+    }
+
+    public int getBoundsLeft() {
+        return getBoundsLeft_native(pointer);
+    }
+
+    public int getBoundsTop() {
+        return getBoundsTop_native(pointer);
+    }
+
+    public int getBoundsRight() {
+        return getBoundsRight_native(pointer);
+    }
+
+    public int getBoundsBottom() {
+        return getBoundsBottom_native(pointer);
+    }
+
+    public Region getClosestAccessibleRegion() {
+        return getClosestAccessibleRegion_native(pointer);
+    }
+
+    public Region getClosestInaccessibleRegion() {
+        return getClosestInaccessibleRegion_native(pointer);
+    }
+
+    public int getDistance(Region other) {
+        return getDistance_native(pointer, other);
+    }
+
+
+    private static Map<Long, Region> instances = new HashMap<Long, Region>();
+
+    private Region(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Region get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Region instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Region(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native int getRegionGroupID_native(long pointer);
+
+    private native Position getCenter_native(long pointer);
+
+    private native boolean isHigherGround_native(long pointer);
+
+    private native int getDefensePriority_native(long pointer);
+
+    private native boolean isAccessible_native(long pointer);
+
+    private native List<Region> getNeighbors_native(long pointer);
+
+    private native int getBoundsLeft_native(long pointer);
+
+    private native int getBoundsTop_native(long pointer);
+
+    private native int getBoundsRight_native(long pointer);
+
+    private native int getBoundsBottom_native(long pointer);
+
+    private native Region getClosestAccessibleRegion_native(long pointer);
+
+    private native Region getClosestInaccessibleRegion_native(long pointer);
+
+    private native int getDistance_native(long pointer, Region other);
+
+
+}
diff --git a/generated/bwapi/Regionset.java b/generated/bwapi/Regionset.java
new file mode 100644
index 0000000..0d51104
--- /dev/null
+++ b/generated/bwapi/Regionset.java
@@ -0,0 +1,40 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Regionset {
+
+    public Position getCenter() {
+        return getCenter_native(pointer);
+    }
+
+
+    private static Map<Long, Regionset> instances = new HashMap<Long, Regionset>();
+
+    private Regionset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Regionset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Regionset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Regionset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native Position getCenter_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/ShapeType/Enum.java b/generated/bwapi/ShapeType/Enum.java
new file mode 100644
index 0000000..92b4abb
--- /dev/null
+++ b/generated/bwapi/ShapeType/Enum.java
@@ -0,0 +1,30 @@
+package bwapi.ShapeType;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	None(0),
+	Text(1),
+	Box(2),
+	Triangle(3),
+	Circle(4),
+	Ellipse(5),
+	Dot(6);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/TechType.java b/generated/bwapi/TechType.java
new file mode 100644
index 0000000..f6ee763
--- /dev/null
+++ b/generated/bwapi/TechType.java
@@ -0,0 +1,172 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class TechType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public int mineralPrice() {
+        return mineralPrice_native(pointer);
+    }
+
+    public int gasPrice() {
+        return gasPrice_native(pointer);
+    }
+
+    public int researchTime() {
+        return researchTime_native(pointer);
+    }
+
+    public int energyCost() {
+        return energyCost_native(pointer);
+    }
+
+    public UnitType whatResearches() {
+        return whatResearches_native(pointer);
+    }
+
+    public WeaponType getWeapon() {
+        return getWeapon_native(pointer);
+    }
+
+    public boolean targetsUnit() {
+        return targetsUnit_native(pointer);
+    }
+
+    public boolean targetsPosition() {
+        return targetsPosition_native(pointer);
+    }
+
+    public Order getOrder() {
+        return getOrder_native(pointer);
+    }
+
+    public static TechType Stim_Packs;
+
+    public static TechType Lockdown;
+
+    public static TechType EMP_Shockwave;
+
+    public static TechType Spider_Mines;
+
+    public static TechType Scanner_Sweep;
+
+    public static TechType Tank_Siege_Mode;
+
+    public static TechType Defensive_Matrix;
+
+    public static TechType Irradiate;
+
+    public static TechType Yamato_Gun;
+
+    public static TechType Cloaking_Field;
+
+    public static TechType Personnel_Cloaking;
+
+    public static TechType Burrowing;
+
+    public static TechType Infestation;
+
+    public static TechType Spawn_Broodlings;
+
+    public static TechType Dark_Swarm;
+
+    public static TechType Plague;
+
+    public static TechType Consume;
+
+    public static TechType Ensnare;
+
+    public static TechType Parasite;
+
+    public static TechType Psionic_Storm;
+
+    public static TechType Hallucination;
+
+    public static TechType Recall;
+
+    public static TechType Stasis_Field;
+
+    public static TechType Archon_Warp;
+
+    public static TechType Restoration;
+
+    public static TechType Disruption_Web;
+
+    public static TechType Mind_Control;
+
+    public static TechType Dark_Archon_Meld;
+
+    public static TechType Feedback;
+
+    public static TechType Optical_Flare;
+
+    public static TechType Maelstrom;
+
+    public static TechType Lurker_Aspect;
+
+    public static TechType Healing;
+
+    public static TechType None;
+
+    public static TechType Nuclear_Strike;
+
+    public static TechType Unknown;
+
+
+    private static Map<Long, TechType> instances = new HashMap<Long, TechType>();
+
+    private TechType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static TechType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        TechType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new TechType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native int mineralPrice_native(long pointer);
+
+    private native int gasPrice_native(long pointer);
+
+    private native int researchTime_native(long pointer);
+
+    private native int energyCost_native(long pointer);
+
+    private native UnitType whatResearches_native(long pointer);
+
+    private native WeaponType getWeapon_native(long pointer);
+
+    private native boolean targetsUnit_native(long pointer);
+
+    private native boolean targetsPosition_native(long pointer);
+
+    private native Order getOrder_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Text/Enum.java b/generated/bwapi/Text/Enum.java
new file mode 100644
index 0000000..b15a4bb
--- /dev/null
+++ b/generated/bwapi/Text/Enum.java
@@ -0,0 +1,49 @@
+package bwapi.Text;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	Previous(1),
+	Default(2),
+	Yellow(3),
+	White(4),
+	Grey(5),
+	Red(6),
+	Green(7),
+	BrightRed(8),
+	Invisible(11),
+	Blue(14),
+	Teal(15),
+	Purple(16),
+	Orange(17),
+	Align_Right(18),
+	Align_Center(19),
+	Invisible2(20),
+	Brown(21),
+	PlayerWhite(22),
+	PlayerYellow(23),
+	DarkGreen(24),
+	LightYellow(25),
+	Cyan(26),
+	Tan(27),
+	GreyBlue(28),
+	GreyGreen(29),
+	GreyCyan(30);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/Text/Size/Enum.java b/generated/bwapi/Text/Size/Enum.java
new file mode 100644
index 0000000..15314ee
--- /dev/null
+++ b/generated/bwapi/Text/Size/Enum.java
@@ -0,0 +1,26 @@
+package bwapi.Text.Size;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	Small(0),
+	Default(1),
+	Large(2);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/TilePosition.java b/generated/bwapi/TilePosition.java
new file mode 100644
index 0000000..a88ae76
--- /dev/null
+++ b/generated/bwapi/TilePosition.java
@@ -0,0 +1,85 @@
+package bwapi;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Build Tiles - each build tile is a 4x4 square of walk tiles, or a 32x32 square of pixels.
+ * These are called build tiles because buildability data is available at this resolution, and correspond to the tiles seen in game.
+ * For example, a Command Center occupies an area of 4x3 build tiles.
+ */
+public class TilePosition extends AbstractPoint<TilePosition>{
+    private int x, y;
+
+    public TilePosition(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public String toString() {
+        return "[" + x + ", " + y + "]";
+    }
+
+    public native boolean isValid();
+
+    public native TilePosition makeValid();
+
+    public native double getLength();
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public static TilePosition Invalid;
+
+    public static TilePosition None;
+
+    public static TilePosition Unknown;
+
+    private static Map<Long, TilePosition> instances = new HashMap<Long, TilePosition>();
+
+    private TilePosition(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static TilePosition get(long pointer) {
+        TilePosition instance = instances.get(pointer);
+        if (instance == null) {
+            instance = new TilePosition(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof TilePosition)) return false;
+
+        TilePosition that = (TilePosition) o;
+
+        if (x != that.x) return false;
+        if (y != that.y) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x;
+        result = 31 * result + y;
+        return result;
+    }
+
+    public TilePosition getPoint(){
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/Tournament/ActionID.java b/generated/bwapi/Tournament/ActionID.java
new file mode 100644
index 0000000..18c3280
--- /dev/null
+++ b/generated/bwapi/Tournament/ActionID.java
@@ -0,0 +1,35 @@
+package bwapi.Tournament;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum ActionID {
+
+	EnableFlag(0),
+	PauseGame(1),
+	ResumeGame(2),
+	LeaveGame(3),
+	SetLocalSpeed(4),
+	SetTextSize(5),
+	SetLatCom(6),
+	SetGUI(7),
+	SetMap(8),
+	SetFrameSkip(9),
+	Printf(10),
+	SendText(11);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	ActionID(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi/UnaryFilter.java b/generated/bwapi/UnaryFilter.java
new file mode 100644
index 0000000..18aaf62
--- /dev/null
+++ b/generated/bwapi/UnaryFilter.java
@@ -0,0 +1,34 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnaryFilter {
+
+
+    private static Map<Long, UnaryFilter> instances = new HashMap<Long, UnaryFilter>();
+
+    private UnaryFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnaryFilter get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnaryFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnaryFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi/Unit.java b/generated/bwapi/Unit.java
new file mode 100644
index 0000000..02c2c2e
--- /dev/null
+++ b/generated/bwapi/Unit.java
@@ -0,0 +1,2760 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+import bwapi.PositionedObject;
+
+public class Unit extends PositionedObject 
+{
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public boolean exists() {
+        return exists_native(pointer);
+    }
+
+    public int getReplayID() {
+        return getReplayID_native(pointer);
+    }
+
+    public Player getPlayer() {
+        return getPlayer_native(pointer);
+    }
+
+    public UnitType getType() {
+        return getType_native(pointer);
+    }
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public TilePosition getTilePosition() {
+        return getTilePosition_native(pointer);
+    }
+
+    public double getAngle() {
+        return getAngle_native(pointer);
+    }
+
+    public double getVelocityX() {
+        return getVelocityX_native(pointer);
+    }
+
+    public double getVelocityY() {
+        return getVelocityY_native(pointer);
+    }
+
+    public Region getRegion() {
+        return getRegion_native(pointer);
+    }
+
+    public int getLeft() {
+        return getLeft_native(pointer);
+    }
+
+    public int getTop() {
+        return getTop_native(pointer);
+    }
+
+    public int getRight() {
+        return getRight_native(pointer);
+    }
+
+    public int getBottom() {
+        return getBottom_native(pointer);
+    }
+
+    public int getHitPoints() {
+        return getHitPoints_native(pointer);
+    }
+
+    public int getShields() {
+        return getShields_native(pointer);
+    }
+
+    public int getEnergy() {
+        return getEnergy_native(pointer);
+    }
+
+    public int getResources() {
+        return getResources_native(pointer);
+    }
+
+    public int getResourceGroup() {
+        return getResourceGroup_native(pointer);
+    }
+
+    public int getDistance(PositionOrUnit target) {
+        return getDistance_native(pointer, target);
+    }
+
+    public boolean hasPath(PositionOrUnit target) {
+        return hasPath_native(pointer, target);
+    }
+
+    public int getLastCommandFrame() {
+        return getLastCommandFrame_native(pointer);
+    }
+
+    public UnitCommand getLastCommand() {
+        return getLastCommand_native(pointer);
+    }
+
+    public Player getLastAttackingPlayer() {
+        return getLastAttackingPlayer_native(pointer);
+    }
+
+    public UnitType getInitialType() {
+        return getInitialType_native(pointer);
+    }
+
+    public Position getInitialPosition() {
+        return getInitialPosition_native(pointer);
+    }
+
+    public TilePosition getInitialTilePosition() {
+        return getInitialTilePosition_native(pointer);
+    }
+
+    public int getInitialHitPoints() {
+        return getInitialHitPoints_native(pointer);
+    }
+
+    public int getInitialResources() {
+        return getInitialResources_native(pointer);
+    }
+
+    public int getKillCount() {
+        return getKillCount_native(pointer);
+    }
+
+    public int getAcidSporeCount() {
+        return getAcidSporeCount_native(pointer);
+    }
+
+    public int getInterceptorCount() {
+        return getInterceptorCount_native(pointer);
+    }
+
+    public int getScarabCount() {
+        return getScarabCount_native(pointer);
+    }
+
+    public int getSpiderMineCount() {
+        return getSpiderMineCount_native(pointer);
+    }
+
+    public int getGroundWeaponCooldown() {
+        return getGroundWeaponCooldown_native(pointer);
+    }
+
+    public int getAirWeaponCooldown() {
+        return getAirWeaponCooldown_native(pointer);
+    }
+
+    public int getSpellCooldown() {
+        return getSpellCooldown_native(pointer);
+    }
+
+    public int getDefenseMatrixPoints() {
+        return getDefenseMatrixPoints_native(pointer);
+    }
+
+    public int getDefenseMatrixTimer() {
+        return getDefenseMatrixTimer_native(pointer);
+    }
+
+    public int getEnsnareTimer() {
+        return getEnsnareTimer_native(pointer);
+    }
+
+    public int getIrradiateTimer() {
+        return getIrradiateTimer_native(pointer);
+    }
+
+    public int getLockdownTimer() {
+        return getLockdownTimer_native(pointer);
+    }
+
+    public int getMaelstromTimer() {
+        return getMaelstromTimer_native(pointer);
+    }
+
+    public int getOrderTimer() {
+        return getOrderTimer_native(pointer);
+    }
+
+    public int getPlagueTimer() {
+        return getPlagueTimer_native(pointer);
+    }
+
+    public int getRemoveTimer() {
+        return getRemoveTimer_native(pointer);
+    }
+
+    public int getStasisTimer() {
+        return getStasisTimer_native(pointer);
+    }
+
+    public int getStimTimer() {
+        return getStimTimer_native(pointer);
+    }
+
+    public UnitType getBuildType() {
+        return getBuildType_native(pointer);
+    }
+
+    public TechType getTech() {
+        return getTech_native(pointer);
+    }
+
+    public UpgradeType getUpgrade() {
+        return getUpgrade_native(pointer);
+    }
+
+    public int getRemainingBuildTime() {
+        return getRemainingBuildTime_native(pointer);
+    }
+
+    public int getRemainingTrainTime() {
+        return getRemainingTrainTime_native(pointer);
+    }
+
+    public int getRemainingResearchTime() {
+        return getRemainingResearchTime_native(pointer);
+    }
+
+    public int getRemainingUpgradeTime() {
+        return getRemainingUpgradeTime_native(pointer);
+    }
+
+    public Unit getBuildUnit() {
+        return getBuildUnit_native(pointer);
+    }
+
+    public Unit getTarget() {
+        return getTarget_native(pointer);
+    }
+
+    public Position getTargetPosition() {
+        return getTargetPosition_native(pointer);
+    }
+
+    public Order getOrder() {
+        return getOrder_native(pointer);
+    }
+
+    public Order getSecondaryOrder() {
+        return getSecondaryOrder_native(pointer);
+    }
+
+    public Unit getOrderTarget() {
+        return getOrderTarget_native(pointer);
+    }
+
+    public Position getOrderTargetPosition() {
+        return getOrderTargetPosition_native(pointer);
+    }
+
+    public Position getRallyPosition() {
+        return getRallyPosition_native(pointer);
+    }
+
+    public Unit getRallyUnit() {
+        return getRallyUnit_native(pointer);
+    }
+
+    public Unit getAddon() {
+        return getAddon_native(pointer);
+    }
+
+    public Unit getNydusExit() {
+        return getNydusExit_native(pointer);
+    }
+
+    public Unit getPowerUp() {
+        return getPowerUp_native(pointer);
+    }
+
+    public Unit getTransport() {
+        return getTransport_native(pointer);
+    }
+
+    public List<Unit> getLoadedUnits() {
+        return getLoadedUnits_native(pointer);
+    }
+
+    public int getSpaceRemaining() {
+        return getSpaceRemaining_native(pointer);
+    }
+
+    public Unit getCarrier() {
+        return getCarrier_native(pointer);
+    }
+
+    public List<Unit> getInterceptors() {
+        return getInterceptors_native(pointer);
+    }
+
+    public Unit getHatchery() {
+        return getHatchery_native(pointer);
+    }
+
+    public List<Unit> getLarva() {
+        return getLarva_native(pointer);
+    }
+
+    public boolean hasNuke() {
+        return hasNuke_native(pointer);
+    }
+
+    public boolean isAccelerating() {
+        return isAccelerating_native(pointer);
+    }
+
+    public boolean isAttacking() {
+        return isAttacking_native(pointer);
+    }
+
+    public boolean isAttackFrame() {
+        return isAttackFrame_native(pointer);
+    }
+
+    public boolean isBeingConstructed() {
+        return isBeingConstructed_native(pointer);
+    }
+
+    public boolean isBeingGathered() {
+        return isBeingGathered_native(pointer);
+    }
+
+    public boolean isBeingHealed() {
+        return isBeingHealed_native(pointer);
+    }
+
+    public boolean isBlind() {
+        return isBlind_native(pointer);
+    }
+
+    public boolean isBraking() {
+        return isBraking_native(pointer);
+    }
+
+    public boolean isBurrowed() {
+        return isBurrowed_native(pointer);
+    }
+
+    public boolean isCarryingGas() {
+        return isCarryingGas_native(pointer);
+    }
+
+    public boolean isCarryingMinerals() {
+        return isCarryingMinerals_native(pointer);
+    }
+
+    public boolean isCloaked() {
+        return isCloaked_native(pointer);
+    }
+
+    public boolean isCompleted() {
+        return isCompleted_native(pointer);
+    }
+
+    public boolean isConstructing() {
+        return isConstructing_native(pointer);
+    }
+
+    public boolean isDefenseMatrixed() {
+        return isDefenseMatrixed_native(pointer);
+    }
+
+    public boolean isDetected() {
+        return isDetected_native(pointer);
+    }
+
+    public boolean isEnsnared() {
+        return isEnsnared_native(pointer);
+    }
+
+    public boolean isFlying() {
+        return isFlying_native(pointer);
+    }
+
+    public boolean isFollowing() {
+        return isFollowing_native(pointer);
+    }
+
+    public boolean isGatheringGas() {
+        return isGatheringGas_native(pointer);
+    }
+
+    public boolean isGatheringMinerals() {
+        return isGatheringMinerals_native(pointer);
+    }
+
+    public boolean isHallucination() {
+        return isHallucination_native(pointer);
+    }
+
+    public boolean isHoldingPosition() {
+        return isHoldingPosition_native(pointer);
+    }
+
+    public boolean isIdle() {
+        return isIdle_native(pointer);
+    }
+
+    public boolean isInterruptible() {
+        return isInterruptible_native(pointer);
+    }
+
+    public boolean isInvincible() {
+        return isInvincible_native(pointer);
+    }
+
+    public boolean isInWeaponRange(Unit target) {
+        return isInWeaponRange_native(pointer, target);
+    }
+
+    public boolean isIrradiated() {
+        return isIrradiated_native(pointer);
+    }
+
+    public boolean isLifted() {
+        return isLifted_native(pointer);
+    }
+
+    public boolean isLoaded() {
+        return isLoaded_native(pointer);
+    }
+
+    public boolean isLockedDown() {
+        return isLockedDown_native(pointer);
+    }
+
+    public boolean isMaelstrommed() {
+        return isMaelstrommed_native(pointer);
+    }
+
+    public boolean isMorphing() {
+        return isMorphing_native(pointer);
+    }
+
+    public boolean isMoving() {
+        return isMoving_native(pointer);
+    }
+
+    public boolean isParasited() {
+        return isParasited_native(pointer);
+    }
+
+    public boolean isPatrolling() {
+        return isPatrolling_native(pointer);
+    }
+
+    public boolean isPlagued() {
+        return isPlagued_native(pointer);
+    }
+
+    public boolean isRepairing() {
+        return isRepairing_native(pointer);
+    }
+
+    public boolean isResearching() {
+        return isResearching_native(pointer);
+    }
+
+    public boolean isSelected() {
+        return isSelected_native(pointer);
+    }
+
+    public boolean isSieged() {
+        return isSieged_native(pointer);
+    }
+
+    public boolean isStartingAttack() {
+        return isStartingAttack_native(pointer);
+    }
+
+    public boolean isStasised() {
+        return isStasised_native(pointer);
+    }
+
+    public boolean isStimmed() {
+        return isStimmed_native(pointer);
+    }
+
+    public boolean isStuck() {
+        return isStuck_native(pointer);
+    }
+
+    public boolean isTraining() {
+        return isTraining_native(pointer);
+    }
+
+    public boolean isUnderAttack() {
+        return isUnderAttack_native(pointer);
+    }
+
+    public boolean isUnderDarkSwarm() {
+        return isUnderDarkSwarm_native(pointer);
+    }
+
+    public boolean isUnderDisruptionWeb() {
+        return isUnderDisruptionWeb_native(pointer);
+    }
+
+    public boolean isUnderStorm() {
+        return isUnderStorm_native(pointer);
+    }
+
+    public boolean isPowered() {
+        return isPowered_native(pointer);
+    }
+
+    public boolean isUpgrading() {
+        return isUpgrading_native(pointer);
+    }
+
+    public boolean isVisible() {
+        return isVisible_native(pointer);
+    }
+
+    public boolean isVisible(Player player) {
+        return isVisible_native(pointer, player);
+    }
+
+    public boolean isTargetable() {
+        return isTargetable_native(pointer);
+    }
+
+    public boolean issueCommand(UnitCommand command) {
+        return issueCommand_native(pointer, command);
+    }
+
+    public boolean attack(PositionOrUnit target) {
+        return attack_native(pointer, target);
+    }
+
+    public boolean attack(PositionOrUnit target, boolean shiftQueueCommand) {
+        return attack_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean build(UnitType type) {
+        return build_native(pointer, type);
+    }
+
+    public boolean build(UnitType type, TilePosition target) {
+        return build_native(pointer, type, target);
+    }
+
+    public boolean buildAddon(UnitType type) {
+        return buildAddon_native(pointer, type);
+    }
+
+    public boolean train() {
+        return train_native(pointer);
+    }
+
+    public boolean train(UnitType type) {
+        return train_native(pointer, type);
+    }
+
+    public boolean morph(UnitType type) {
+        return morph_native(pointer, type);
+    }
+
+    public boolean research(TechType tech) {
+        return research_native(pointer, tech);
+    }
+
+    public boolean upgrade(UpgradeType upgrade) {
+        return upgrade_native(pointer, upgrade);
+    }
+
+    public boolean setRallyPoint(PositionOrUnit target) {
+        return setRallyPoint_native(pointer, target);
+    }
+
+    public boolean move(Position target) {
+        return move_native(pointer, target);
+    }
+
+    public boolean move(Position target, boolean shiftQueueCommand) {
+        return move_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean patrol(Position target) {
+        return patrol_native(pointer, target);
+    }
+
+    public boolean patrol(Position target, boolean shiftQueueCommand) {
+        return patrol_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean holdPosition() {
+        return holdPosition_native(pointer);
+    }
+
+    public boolean holdPosition(boolean shiftQueueCommand) {
+        return holdPosition_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean stop() {
+        return stop_native(pointer);
+    }
+
+    public boolean stop(boolean shiftQueueCommand) {
+        return stop_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean follow(Unit target) {
+        return follow_native(pointer, target);
+    }
+
+    public boolean follow(Unit target, boolean shiftQueueCommand) {
+        return follow_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean gather(Unit target) {
+        return gather_native(pointer, target);
+    }
+
+    public boolean gather(Unit target, boolean shiftQueueCommand) {
+        return gather_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean returnCargo() {
+        return returnCargo_native(pointer);
+    }
+
+    public boolean returnCargo(boolean shiftQueueCommand) {
+        return returnCargo_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean repair(Unit target) {
+        return repair_native(pointer, target);
+    }
+
+    public boolean repair(Unit target, boolean shiftQueueCommand) {
+        return repair_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean burrow() {
+        return burrow_native(pointer);
+    }
+
+    public boolean unburrow() {
+        return unburrow_native(pointer);
+    }
+
+    public boolean cloak() {
+        return cloak_native(pointer);
+    }
+
+    public boolean decloak() {
+        return decloak_native(pointer);
+    }
+
+    public boolean siege() {
+        return siege_native(pointer);
+    }
+
+    public boolean unsiege() {
+        return unsiege_native(pointer);
+    }
+
+    public boolean lift() {
+        return lift_native(pointer);
+    }
+
+    public boolean land(TilePosition target) {
+        return land_native(pointer, target);
+    }
+
+    public boolean load(Unit target) {
+        return load_native(pointer, target);
+    }
+
+    public boolean load(Unit target, boolean shiftQueueCommand) {
+        return load_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean unload(Unit target) {
+        return unload_native(pointer, target);
+    }
+
+    public boolean unloadAll() {
+        return unloadAll_native(pointer);
+    }
+
+    public boolean unloadAll(boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean unloadAll(Position target) {
+        return unloadAll_native(pointer, target);
+    }
+
+    public boolean unloadAll(Position target, boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean rightClick(PositionOrUnit target) {
+        return rightClick_native(pointer, target);
+    }
+
+    public boolean rightClick(PositionOrUnit target, boolean shiftQueueCommand) {
+        return rightClick_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean haltConstruction() {
+        return haltConstruction_native(pointer);
+    }
+
+    public boolean cancelConstruction() {
+        return cancelConstruction_native(pointer);
+    }
+
+    public boolean cancelAddon() {
+        return cancelAddon_native(pointer);
+    }
+
+    public boolean cancelTrain() {
+        return cancelTrain_native(pointer);
+    }
+
+    public boolean cancelTrain(int slot) {
+        return cancelTrain_native(pointer, slot);
+    }
+
+    public boolean cancelMorph() {
+        return cancelMorph_native(pointer);
+    }
+
+    public boolean cancelResearch() {
+        return cancelResearch_native(pointer);
+    }
+
+    public boolean cancelUpgrade() {
+        return cancelUpgrade_native(pointer);
+    }
+
+    public boolean useTech(TechType tech) {
+        return useTech_native(pointer, tech);
+    }
+
+    public boolean useTech(TechType tech, PositionOrUnit target) {
+        return useTech_native(pointer, tech, target);
+    }
+
+    public boolean placeCOP(TilePosition target) {
+        return placeCOP_native(pointer, target);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType, checkCanTargetUnit);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions);
+    }
+
+    public boolean canIssueCommand(UnitCommand command) {
+        return canIssueCommand_native(pointer, command);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command) {
+        return canIssueCommandGrouped_native(pointer, command);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canCommand() {
+        return canCommand_native(pointer);
+    }
+
+    public boolean canCommandGrouped() {
+        return canCommandGrouped_native(pointer);
+    }
+
+    public boolean canCommandGrouped(boolean checkCommandibility) {
+        return canCommandGrouped_native(pointer, checkCommandibility);
+    }
+
+    public boolean canIssueCommandType(UnitCommandType ct) {
+        return canIssueCommandType_native(pointer, ct);
+    }
+
+    public boolean canIssueCommandType(UnitCommandType ct, boolean checkCommandibility) {
+        return canIssueCommandType_native(pointer, ct, checkCommandibility);
+    }
+
+    public boolean canIssueCommandTypeGrouped(UnitCommandType ct, boolean checkCommandibilityGrouped) {
+        return canIssueCommandTypeGrouped_native(pointer, ct, checkCommandibilityGrouped);
+    }
+
+    public boolean canIssueCommandTypeGrouped(UnitCommandType ct) {
+        return canIssueCommandTypeGrouped_native(pointer, ct);
+    }
+
+    public boolean canIssueCommandTypeGrouped(UnitCommandType ct, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canIssueCommandTypeGrouped_native(pointer, ct, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canTargetUnit(Unit targetUnit) {
+        return canTargetUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canTargetUnit(Unit targetUnit, boolean checkCommandibility) {
+        return canTargetUnit_native(pointer, targetUnit, checkCommandibility);
+    }
+
+    public boolean canAttack() {
+        return canAttack_native(pointer);
+    }
+
+    public boolean canAttack(boolean checkCommandibility) {
+        return canAttack_native(pointer, checkCommandibility);
+    }
+
+    public boolean canAttack(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttack_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttack(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canAttack_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canAttack(PositionOrUnit target) {
+        return canAttack_native(pointer, target);
+    }
+
+    public boolean canAttack(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canAttack_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canAttackGrouped(boolean checkCommandibilityGrouped) {
+        return canAttackGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackGrouped() {
+        return canAttackGrouped_native(pointer);
+    }
+
+    public boolean canAttackGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target) {
+        return canAttackGrouped_native(pointer, target);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackMove() {
+        return canAttackMove_native(pointer);
+    }
+
+    public boolean canAttackMove(boolean checkCommandibility) {
+        return canAttackMove_native(pointer, checkCommandibility);
+    }
+
+    public boolean canAttackMoveGrouped(boolean checkCommandibilityGrouped) {
+        return canAttackMoveGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackMoveGrouped() {
+        return canAttackMoveGrouped_native(pointer);
+    }
+
+    public boolean canAttackMoveGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackMoveGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackUnit() {
+        return canAttackUnit_native(pointer);
+    }
+
+    public boolean canAttackUnit(boolean checkCommandibility) {
+        return canAttackUnit_native(pointer, checkCommandibility);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttackUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canAttackUnit_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit) {
+        return canAttackUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canAttackUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canAttackUnitGrouped(boolean checkCommandibilityGrouped) {
+        return canAttackUnitGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackUnitGrouped() {
+        return canAttackUnitGrouped_native(pointer);
+    }
+
+    public boolean canAttackUnitGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackUnitGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit) {
+        return canAttackUnitGrouped_native(pointer, targetUnit);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canBuild() {
+        return canBuild_native(pointer);
+    }
+
+    public boolean canBuild(boolean checkCommandibility) {
+        return canBuild_native(pointer, checkCommandibility);
+    }
+
+    public boolean canBuild(UnitType uType, boolean checkCanIssueCommandType) {
+        return canBuild_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canBuild(UnitType uType) {
+        return canBuild_native(pointer, uType);
+    }
+
+    public boolean canBuild(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canBuild_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType) {
+        return canBuild_native(pointer, uType, tilePos, checkTargetUnitType, checkCanIssueCommandType);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos, boolean checkTargetUnitType) {
+        return canBuild_native(pointer, uType, tilePos, checkTargetUnitType);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos) {
+        return canBuild_native(pointer, uType, tilePos);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canBuild_native(pointer, uType, tilePos, checkTargetUnitType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canBuildAddon() {
+        return canBuildAddon_native(pointer);
+    }
+
+    public boolean canBuildAddon(boolean checkCommandibility) {
+        return canBuildAddon_native(pointer, checkCommandibility);
+    }
+
+    public boolean canBuildAddon(UnitType uType, boolean checkCanIssueCommandType) {
+        return canBuildAddon_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canBuildAddon(UnitType uType) {
+        return canBuildAddon_native(pointer, uType);
+    }
+
+    public boolean canBuildAddon(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canBuildAddon_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canTrain() {
+        return canTrain_native(pointer);
+    }
+
+    public boolean canTrain(boolean checkCommandibility) {
+        return canTrain_native(pointer, checkCommandibility);
+    }
+
+    public boolean canTrain(UnitType uType, boolean checkCanIssueCommandType) {
+        return canTrain_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canTrain(UnitType uType) {
+        return canTrain_native(pointer, uType);
+    }
+
+    public boolean canTrain(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canTrain_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canMorph() {
+        return canMorph_native(pointer);
+    }
+
+    public boolean canMorph(boolean checkCommandibility) {
+        return canMorph_native(pointer, checkCommandibility);
+    }
+
+    public boolean canMorph(UnitType uType, boolean checkCanIssueCommandType) {
+        return canMorph_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canMorph(UnitType uType) {
+        return canMorph_native(pointer, uType);
+    }
+
+    public boolean canMorph(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canMorph_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canResearch() {
+        return canResearch_native(pointer);
+    }
+
+    public boolean canResearch(boolean checkCommandibility) {
+        return canResearch_native(pointer, checkCommandibility);
+    }
+
+    public boolean canResearch(TechType type) {
+        return canResearch_native(pointer, type);
+    }
+
+    public boolean canResearch(TechType type, boolean checkCanIssueCommandType) {
+        return canResearch_native(pointer, type, checkCanIssueCommandType);
+    }
+
+    public boolean canUpgrade() {
+        return canUpgrade_native(pointer);
+    }
+
+    public boolean canUpgrade(boolean checkCommandibility) {
+        return canUpgrade_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUpgrade(UpgradeType type) {
+        return canUpgrade_native(pointer, type);
+    }
+
+    public boolean canUpgrade(UpgradeType type, boolean checkCanIssueCommandType) {
+        return canUpgrade_native(pointer, type, checkCanIssueCommandType);
+    }
+
+    public boolean canSetRallyPoint() {
+        return canSetRallyPoint_native(pointer);
+    }
+
+    public boolean canSetRallyPoint(boolean checkCommandibility) {
+        return canSetRallyPoint_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canSetRallyPoint_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canSetRallyPoint_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target) {
+        return canSetRallyPoint_native(pointer, target);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canSetRallyPoint_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canSetRallyPosition() {
+        return canSetRallyPosition_native(pointer);
+    }
+
+    public boolean canSetRallyPosition(boolean checkCommandibility) {
+        return canSetRallyPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSetRallyUnit() {
+        return canSetRallyUnit_native(pointer);
+    }
+
+    public boolean canSetRallyUnit(boolean checkCommandibility) {
+        return canSetRallyUnit_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canSetRallyUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canSetRallyUnit_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit) {
+        return canSetRallyUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canSetRallyUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canMove() {
+        return canMove_native(pointer);
+    }
+
+    public boolean canMove(boolean checkCommandibility) {
+        return canMove_native(pointer, checkCommandibility);
+    }
+
+    public boolean canMoveGrouped(boolean checkCommandibilityGrouped) {
+        return canMoveGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canMoveGrouped() {
+        return canMoveGrouped_native(pointer);
+    }
+
+    public boolean canMoveGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canMoveGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canPatrol() {
+        return canPatrol_native(pointer);
+    }
+
+    public boolean canPatrol(boolean checkCommandibility) {
+        return canPatrol_native(pointer, checkCommandibility);
+    }
+
+    public boolean canPatrolGrouped(boolean checkCommandibilityGrouped) {
+        return canPatrolGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canPatrolGrouped() {
+        return canPatrolGrouped_native(pointer);
+    }
+
+    public boolean canPatrolGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canPatrolGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canFollow() {
+        return canFollow_native(pointer);
+    }
+
+    public boolean canFollow(boolean checkCommandibility) {
+        return canFollow_native(pointer, checkCommandibility);
+    }
+
+    public boolean canFollow(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canFollow_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canFollow(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canFollow_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canFollow(Unit targetUnit) {
+        return canFollow_native(pointer, targetUnit);
+    }
+
+    public boolean canFollow(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canFollow_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canGather() {
+        return canGather_native(pointer);
+    }
+
+    public boolean canGather(boolean checkCommandibility) {
+        return canGather_native(pointer, checkCommandibility);
+    }
+
+    public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canGather_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canGather_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canGather(Unit targetUnit) {
+        return canGather_native(pointer, targetUnit);
+    }
+
+    public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canGather_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canReturnCargo() {
+        return canReturnCargo_native(pointer);
+    }
+
+    public boolean canReturnCargo(boolean checkCommandibility) {
+        return canReturnCargo_native(pointer, checkCommandibility);
+    }
+
+    public boolean canHoldPosition() {
+        return canHoldPosition_native(pointer);
+    }
+
+    public boolean canHoldPosition(boolean checkCommandibility) {
+        return canHoldPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canStop() {
+        return canStop_native(pointer);
+    }
+
+    public boolean canStop(boolean checkCommandibility) {
+        return canStop_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRepair() {
+        return canRepair_native(pointer);
+    }
+
+    public boolean canRepair(boolean checkCommandibility) {
+        return canRepair_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRepair(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRepair_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRepair(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canRepair_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canRepair(Unit targetUnit) {
+        return canRepair_native(pointer, targetUnit);
+    }
+
+    public boolean canRepair(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canRepair_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canBurrow() {
+        return canBurrow_native(pointer);
+    }
+
+    public boolean canBurrow(boolean checkCommandibility) {
+        return canBurrow_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnburrow() {
+        return canUnburrow_native(pointer);
+    }
+
+    public boolean canUnburrow(boolean checkCommandibility) {
+        return canUnburrow_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCloak() {
+        return canCloak_native(pointer);
+    }
+
+    public boolean canCloak(boolean checkCommandibility) {
+        return canCloak_native(pointer, checkCommandibility);
+    }
+
+    public boolean canDecloak() {
+        return canDecloak_native(pointer);
+    }
+
+    public boolean canDecloak(boolean checkCommandibility) {
+        return canDecloak_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSiege() {
+        return canSiege_native(pointer);
+    }
+
+    public boolean canSiege(boolean checkCommandibility) {
+        return canSiege_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnsiege() {
+        return canUnsiege_native(pointer);
+    }
+
+    public boolean canUnsiege(boolean checkCommandibility) {
+        return canUnsiege_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLift() {
+        return canLift_native(pointer);
+    }
+
+    public boolean canLift(boolean checkCommandibility) {
+        return canLift_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLand() {
+        return canLand_native(pointer);
+    }
+
+    public boolean canLand(boolean checkCommandibility) {
+        return canLand_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLand(TilePosition target, boolean checkCanIssueCommandType) {
+        return canLand_native(pointer, target, checkCanIssueCommandType);
+    }
+
+    public boolean canLand(TilePosition target) {
+        return canLand_native(pointer, target);
+    }
+
+    public boolean canLand(TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canLand_native(pointer, target, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canLoad() {
+        return canLoad_native(pointer);
+    }
+
+    public boolean canLoad(boolean checkCommandibility) {
+        return canLoad_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canLoad_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canLoad_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canLoad(Unit targetUnit) {
+        return canLoad_native(pointer, targetUnit);
+    }
+
+    public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canLoad_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUnloadWithOrWithoutTarget() {
+        return canUnloadWithOrWithoutTarget_native(pointer);
+    }
+
+    public boolean canUnloadWithOrWithoutTarget(boolean checkCommandibility) {
+        return canUnloadWithOrWithoutTarget_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnloadAtPosition(Position targDropPos, boolean checkCanIssueCommandType) {
+        return canUnloadAtPosition_native(pointer, targDropPos, checkCanIssueCommandType);
+    }
+
+    public boolean canUnloadAtPosition(Position targDropPos) {
+        return canUnloadAtPosition_native(pointer, targDropPos);
+    }
+
+    public boolean canUnloadAtPosition(Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUnloadAtPosition_native(pointer, targDropPos, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUnload() {
+        return canUnload_native(pointer);
+    }
+
+    public boolean canUnload(boolean checkCommandibility) {
+        return canUnload_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit, checkPosition, checkCanIssueCommandType);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit, checkPosition);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canUnload(Unit targetUnit) {
+        return canUnload_native(pointer, targetUnit);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit, checkPosition, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUnloadAll() {
+        return canUnloadAll_native(pointer);
+    }
+
+    public boolean canUnloadAll(boolean checkCommandibility) {
+        return canUnloadAll_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnloadAllPosition() {
+        return canUnloadAllPosition_native(pointer);
+    }
+
+    public boolean canUnloadAllPosition(boolean checkCommandibility) {
+        return canUnloadAllPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnloadAllPosition(Position targDropPos, boolean checkCanIssueCommandType) {
+        return canUnloadAllPosition_native(pointer, targDropPos, checkCanIssueCommandType);
+    }
+
+    public boolean canUnloadAllPosition(Position targDropPos) {
+        return canUnloadAllPosition_native(pointer, targDropPos);
+    }
+
+    public boolean canUnloadAllPosition(Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUnloadAllPosition_native(pointer, targDropPos, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canRightClick() {
+        return canRightClick_native(pointer);
+    }
+
+    public boolean canRightClick(boolean checkCommandibility) {
+        return canRightClick_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRightClick(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClick_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClick(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canRightClick_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canRightClick(PositionOrUnit target) {
+        return canRightClick_native(pointer, target);
+    }
+
+    public boolean canRightClick(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canRightClick_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canRightClickGrouped(boolean checkCommandibilityGrouped) {
+        return canRightClickGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickGrouped() {
+        return canRightClickGrouped_native(pointer);
+    }
+
+    public boolean canRightClickGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target) {
+        return canRightClickGrouped_native(pointer, target);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickPosition() {
+        return canRightClickPosition_native(pointer);
+    }
+
+    public boolean canRightClickPosition(boolean checkCommandibility) {
+        return canRightClickPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRightClickPositionGrouped(boolean checkCommandibilityGrouped) {
+        return canRightClickPositionGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickPositionGrouped() {
+        return canRightClickPositionGrouped_native(pointer);
+    }
+
+    public boolean canRightClickPositionGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickPositionGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickUnit() {
+        return canRightClickUnit_native(pointer);
+    }
+
+    public boolean canRightClickUnit(boolean checkCommandibility) {
+        return canRightClickUnit_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClickUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canRightClickUnit_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit) {
+        return canRightClickUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canRightClickUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canRightClickUnitGrouped(boolean checkCommandibilityGrouped) {
+        return canRightClickUnitGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickUnitGrouped() {
+        return canRightClickUnitGrouped_native(pointer);
+    }
+
+    public boolean canRightClickUnitGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickUnitGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canHaltConstruction() {
+        return canHaltConstruction_native(pointer);
+    }
+
+    public boolean canHaltConstruction(boolean checkCommandibility) {
+        return canHaltConstruction_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelConstruction() {
+        return canCancelConstruction_native(pointer);
+    }
+
+    public boolean canCancelConstruction(boolean checkCommandibility) {
+        return canCancelConstruction_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelAddon() {
+        return canCancelAddon_native(pointer);
+    }
+
+    public boolean canCancelAddon(boolean checkCommandibility) {
+        return canCancelAddon_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelTrain() {
+        return canCancelTrain_native(pointer);
+    }
+
+    public boolean canCancelTrain(boolean checkCommandibility) {
+        return canCancelTrain_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelTrainSlot() {
+        return canCancelTrainSlot_native(pointer);
+    }
+
+    public boolean canCancelTrainSlot(boolean checkCommandibility) {
+        return canCancelTrainSlot_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelTrainSlot(int slot, boolean checkCanIssueCommandType) {
+        return canCancelTrainSlot_native(pointer, slot, checkCanIssueCommandType);
+    }
+
+    public boolean canCancelTrainSlot(int slot) {
+        return canCancelTrainSlot_native(pointer, slot);
+    }
+
+    public boolean canCancelTrainSlot(int slot, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canCancelTrainSlot_native(pointer, slot, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canCancelMorph() {
+        return canCancelMorph_native(pointer);
+    }
+
+    public boolean canCancelMorph(boolean checkCommandibility) {
+        return canCancelMorph_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelResearch() {
+        return canCancelResearch_native(pointer);
+    }
+
+    public boolean canCancelResearch(boolean checkCommandibility) {
+        return canCancelResearch_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelUpgrade() {
+        return canCancelUpgrade_native(pointer);
+    }
+
+    public boolean canCancelUpgrade(boolean checkCommandibility) {
+        return canCancelUpgrade_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget() {
+        return canUseTechWithOrWithoutTarget_native(pointer);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(boolean checkCommandibility) {
+        return canUseTechWithOrWithoutTarget_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechWithOrWithoutTarget_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(TechType tech) {
+        return canUseTechWithOrWithoutTarget_native(pointer, tech);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechWithOrWithoutTarget_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit, checkTargetsType, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit, checkTargetsType);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target) {
+        return canUseTech_native(pointer, tech, target);
+    }
+
+    public boolean canUseTech(TechType tech) {
+        return canUseTech_native(pointer, tech);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit, checkTargetsType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechWithoutTarget(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechWithoutTarget_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechWithoutTarget(TechType tech) {
+        return canUseTechWithoutTarget_native(pointer, tech);
+    }
+
+    public boolean canUseTechWithoutTarget(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechWithoutTarget_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechUnit(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechUnit_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechUnit(TechType tech) {
+        return canUseTechUnit_native(pointer, tech);
+    }
+
+    public boolean canUseTechUnit(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechUnit_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit, checkTargetsUnits, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit, checkTargetsUnits);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit) {
+        return canUseTechUnit_native(pointer, tech, targetUnit);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit, checkTargetsUnits, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechPosition(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechPosition_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechPosition(TechType tech) {
+        return canUseTechPosition_native(pointer, tech);
+    }
+
+    public boolean canUseTechPosition(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechPosition_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType) {
+        return canUseTechPosition_native(pointer, tech, target, checkTargetsPositions, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target, boolean checkTargetsPositions) {
+        return canUseTechPosition_native(pointer, tech, target, checkTargetsPositions);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target) {
+        return canUseTechPosition_native(pointer, tech, target);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechPosition_native(pointer, tech, target, checkTargetsPositions, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canPlaceCOP() {
+        return canPlaceCOP_native(pointer);
+    }
+
+    public boolean canPlaceCOP(boolean checkCommandibility) {
+        return canPlaceCOP_native(pointer, checkCommandibility);
+    }
+
+    public boolean canPlaceCOP(TilePosition target, boolean checkCanIssueCommandType) {
+        return canPlaceCOP_native(pointer, target, checkCanIssueCommandType);
+    }
+
+    public boolean canPlaceCOP(TilePosition target) {
+        return canPlaceCOP_native(pointer, target);
+    }
+
+    public boolean canPlaceCOP(TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canPlaceCOP_native(pointer, target, checkCanIssueCommandType, checkCommandibility);
+    }
+
+
+    private static Map<Long, Unit> instances = new HashMap<Long, Unit>();
+
+    private Unit(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Unit get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Unit instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Unit(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native boolean exists_native(long pointer);
+
+    private native int getReplayID_native(long pointer);
+
+    private native Player getPlayer_native(long pointer);
+
+    private native UnitType getType_native(long pointer);
+
+    private native Position getPosition_native(long pointer);
+
+    private native TilePosition getTilePosition_native(long pointer);
+
+    private native double getAngle_native(long pointer);
+
+    private native double getVelocityX_native(long pointer);
+
+    private native double getVelocityY_native(long pointer);
+
+    private native Region getRegion_native(long pointer);
+
+    private native int getLeft_native(long pointer);
+
+    private native int getTop_native(long pointer);
+
+    private native int getRight_native(long pointer);
+
+    private native int getBottom_native(long pointer);
+
+    private native int getHitPoints_native(long pointer);
+
+    private native int getShields_native(long pointer);
+
+    private native int getEnergy_native(long pointer);
+
+    private native int getResources_native(long pointer);
+
+    private native int getResourceGroup_native(long pointer);
+
+    private native int getDistance_native(long pointer, PositionOrUnit target);
+
+    private native boolean hasPath_native(long pointer, PositionOrUnit target);
+
+    private native int getLastCommandFrame_native(long pointer);
+
+    private native UnitCommand getLastCommand_native(long pointer);
+
+    private native Player getLastAttackingPlayer_native(long pointer);
+
+    private native UnitType getInitialType_native(long pointer);
+
+    private native Position getInitialPosition_native(long pointer);
+
+    private native TilePosition getInitialTilePosition_native(long pointer);
+
+    private native int getInitialHitPoints_native(long pointer);
+
+    private native int getInitialResources_native(long pointer);
+
+    private native int getKillCount_native(long pointer);
+
+    private native int getAcidSporeCount_native(long pointer);
+
+    private native int getInterceptorCount_native(long pointer);
+
+    private native int getScarabCount_native(long pointer);
+
+    private native int getSpiderMineCount_native(long pointer);
+
+    private native int getGroundWeaponCooldown_native(long pointer);
+
+    private native int getAirWeaponCooldown_native(long pointer);
+
+    private native int getSpellCooldown_native(long pointer);
+
+    private native int getDefenseMatrixPoints_native(long pointer);
+
+    private native int getDefenseMatrixTimer_native(long pointer);
+
+    private native int getEnsnareTimer_native(long pointer);
+
+    private native int getIrradiateTimer_native(long pointer);
+
+    private native int getLockdownTimer_native(long pointer);
+
+    private native int getMaelstromTimer_native(long pointer);
+
+    private native int getOrderTimer_native(long pointer);
+
+    private native int getPlagueTimer_native(long pointer);
+
+    private native int getRemoveTimer_native(long pointer);
+
+    private native int getStasisTimer_native(long pointer);
+
+    private native int getStimTimer_native(long pointer);
+
+    private native UnitType getBuildType_native(long pointer);
+
+    private native TechType getTech_native(long pointer);
+
+    private native UpgradeType getUpgrade_native(long pointer);
+
+    private native int getRemainingBuildTime_native(long pointer);
+
+    private native int getRemainingTrainTime_native(long pointer);
+
+    private native int getRemainingResearchTime_native(long pointer);
+
+    private native int getRemainingUpgradeTime_native(long pointer);
+
+    private native Unit getBuildUnit_native(long pointer);
+
+    private native Unit getTarget_native(long pointer);
+
+    private native Position getTargetPosition_native(long pointer);
+
+    private native Order getOrder_native(long pointer);
+
+    private native Order getSecondaryOrder_native(long pointer);
+
+    private native Unit getOrderTarget_native(long pointer);
+
+    private native Position getOrderTargetPosition_native(long pointer);
+
+    private native Position getRallyPosition_native(long pointer);
+
+    private native Unit getRallyUnit_native(long pointer);
+
+    private native Unit getAddon_native(long pointer);
+
+    private native Unit getNydusExit_native(long pointer);
+
+    private native Unit getPowerUp_native(long pointer);
+
+    private native Unit getTransport_native(long pointer);
+
+    private native List<Unit> getLoadedUnits_native(long pointer);
+
+    private native int getSpaceRemaining_native(long pointer);
+
+    private native Unit getCarrier_native(long pointer);
+
+    private native List<Unit> getInterceptors_native(long pointer);
+
+    private native Unit getHatchery_native(long pointer);
+
+    private native List<Unit> getLarva_native(long pointer);
+
+    private native boolean hasNuke_native(long pointer);
+
+    private native boolean isAccelerating_native(long pointer);
+
+    private native boolean isAttacking_native(long pointer);
+
+    private native boolean isAttackFrame_native(long pointer);
+
+    private native boolean isBeingConstructed_native(long pointer);
+
+    private native boolean isBeingGathered_native(long pointer);
+
+    private native boolean isBeingHealed_native(long pointer);
+
+    private native boolean isBlind_native(long pointer);
+
+    private native boolean isBraking_native(long pointer);
+
+    private native boolean isBurrowed_native(long pointer);
+
+    private native boolean isCarryingGas_native(long pointer);
+
+    private native boolean isCarryingMinerals_native(long pointer);
+
+    private native boolean isCloaked_native(long pointer);
+
+    private native boolean isCompleted_native(long pointer);
+
+    private native boolean isConstructing_native(long pointer);
+
+    private native boolean isDefenseMatrixed_native(long pointer);
+
+    private native boolean isDetected_native(long pointer);
+
+    private native boolean isEnsnared_native(long pointer);
+
+    private native boolean isFlying_native(long pointer);
+
+    private native boolean isFollowing_native(long pointer);
+
+    private native boolean isGatheringGas_native(long pointer);
+
+    private native boolean isGatheringMinerals_native(long pointer);
+
+    private native boolean isHallucination_native(long pointer);
+
+    private native boolean isHoldingPosition_native(long pointer);
+
+    private native boolean isIdle_native(long pointer);
+
+    private native boolean isInterruptible_native(long pointer);
+
+    private native boolean isInvincible_native(long pointer);
+
+    private native boolean isInWeaponRange_native(long pointer, Unit target);
+
+    private native boolean isIrradiated_native(long pointer);
+
+    private native boolean isLifted_native(long pointer);
+
+    private native boolean isLoaded_native(long pointer);
+
+    private native boolean isLockedDown_native(long pointer);
+
+    private native boolean isMaelstrommed_native(long pointer);
+
+    private native boolean isMorphing_native(long pointer);
+
+    private native boolean isMoving_native(long pointer);
+
+    private native boolean isParasited_native(long pointer);
+
+    private native boolean isPatrolling_native(long pointer);
+
+    private native boolean isPlagued_native(long pointer);
+
+    private native boolean isRepairing_native(long pointer);
+
+    private native boolean isResearching_native(long pointer);
+
+    private native boolean isSelected_native(long pointer);
+
+    private native boolean isSieged_native(long pointer);
+
+    private native boolean isStartingAttack_native(long pointer);
+
+    private native boolean isStasised_native(long pointer);
+
+    private native boolean isStimmed_native(long pointer);
+
+    private native boolean isStuck_native(long pointer);
+
+    private native boolean isTraining_native(long pointer);
+
+    private native boolean isUnderAttack_native(long pointer);
+
+    private native boolean isUnderDarkSwarm_native(long pointer);
+
+    private native boolean isUnderDisruptionWeb_native(long pointer);
+
+    private native boolean isUnderStorm_native(long pointer);
+
+    private native boolean isPowered_native(long pointer);
+
+    private native boolean isUpgrading_native(long pointer);
+
+    private native boolean isVisible_native(long pointer);
+
+    private native boolean isVisible_native(long pointer, Player player);
+
+    private native boolean isTargetable_native(long pointer);
+
+    private native boolean issueCommand_native(long pointer, UnitCommand command);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean build_native(long pointer, UnitType type);
+
+    private native boolean build_native(long pointer, UnitType type, TilePosition target);
+
+    private native boolean buildAddon_native(long pointer, UnitType type);
+
+    private native boolean train_native(long pointer);
+
+    private native boolean train_native(long pointer, UnitType type);
+
+    private native boolean morph_native(long pointer, UnitType type);
+
+    private native boolean research_native(long pointer, TechType tech);
+
+    private native boolean upgrade_native(long pointer, UpgradeType upgrade);
+
+    private native boolean setRallyPoint_native(long pointer, PositionOrUnit target);
+
+    private native boolean move_native(long pointer, Position target);
+
+    private native boolean move_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean patrol_native(long pointer, Position target);
+
+    private native boolean patrol_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean holdPosition_native(long pointer);
+
+    private native boolean holdPosition_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean stop_native(long pointer);
+
+    private native boolean stop_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean follow_native(long pointer, Unit target);
+
+    private native boolean follow_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean gather_native(long pointer, Unit target);
+
+    private native boolean gather_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean returnCargo_native(long pointer);
+
+    private native boolean returnCargo_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean repair_native(long pointer, Unit target);
+
+    private native boolean repair_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean burrow_native(long pointer);
+
+    private native boolean unburrow_native(long pointer);
+
+    private native boolean cloak_native(long pointer);
+
+    private native boolean decloak_native(long pointer);
+
+    private native boolean siege_native(long pointer);
+
+    private native boolean unsiege_native(long pointer);
+
+    private native boolean lift_native(long pointer);
+
+    private native boolean land_native(long pointer, TilePosition target);
+
+    private native boolean load_native(long pointer, Unit target);
+
+    private native boolean load_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean unload_native(long pointer, Unit target);
+
+    private native boolean unloadAll_native(long pointer);
+
+    private native boolean unloadAll_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean unloadAll_native(long pointer, Position target);
+
+    private native boolean unloadAll_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean haltConstruction_native(long pointer);
+
+    private native boolean cancelConstruction_native(long pointer);
+
+    private native boolean cancelAddon_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer, int slot);
+
+    private native boolean cancelMorph_native(long pointer);
+
+    private native boolean cancelResearch_native(long pointer);
+
+    private native boolean cancelUpgrade_native(long pointer);
+
+    private native boolean useTech_native(long pointer, TechType tech);
+
+    private native boolean useTech_native(long pointer, TechType tech, PositionOrUnit target);
+
+    private native boolean placeCOP_native(long pointer, TilePosition target);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canCommand_native(long pointer);
+
+    private native boolean canCommandGrouped_native(long pointer);
+
+    private native boolean canCommandGrouped_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canIssueCommandType_native(long pointer, UnitCommandType ct);
+
+    private native boolean canIssueCommandType_native(long pointer, UnitCommandType ct, boolean checkCommandibility);
+
+    private native boolean canIssueCommandTypeGrouped_native(long pointer, UnitCommandType ct, boolean checkCommandibilityGrouped);
+
+    private native boolean canIssueCommandTypeGrouped_native(long pointer, UnitCommandType ct);
+
+    private native boolean canIssueCommandTypeGrouped_native(long pointer, UnitCommandType ct, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canTargetUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canTargetUnit_native(long pointer, Unit targetUnit, boolean checkCommandibility);
+
+    private native boolean canAttack_native(long pointer);
+
+    private native boolean canAttack_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canAttackGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackGrouped_native(long pointer);
+
+    private native boolean canAttackGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackMove_native(long pointer);
+
+    private native boolean canAttackMove_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canAttackMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackMoveGrouped_native(long pointer);
+
+    private native boolean canAttackMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackUnit_native(long pointer);
+
+    private native boolean canAttackUnit_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackUnitGrouped_native(long pointer);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canBuild_native(long pointer);
+
+    private native boolean canBuild_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos, boolean checkTargetUnitType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canBuildAddon_native(long pointer);
+
+    private native boolean canBuildAddon_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canBuildAddon_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canBuildAddon_native(long pointer, UnitType uType);
+
+    private native boolean canBuildAddon_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canTrain_native(long pointer);
+
+    private native boolean canTrain_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canTrain_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canTrain_native(long pointer, UnitType uType);
+
+    private native boolean canTrain_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canMorph_native(long pointer);
+
+    private native boolean canMorph_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canMorph_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canMorph_native(long pointer, UnitType uType);
+
+    private native boolean canMorph_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canResearch_native(long pointer);
+
+    private native boolean canResearch_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canResearch_native(long pointer, TechType type);
+
+    private native boolean canResearch_native(long pointer, TechType type, boolean checkCanIssueCommandType);
+
+    private native boolean canUpgrade_native(long pointer);
+
+    private native boolean canUpgrade_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type, boolean checkCanIssueCommandType);
+
+    private native boolean canSetRallyPoint_native(long pointer);
+
+    private native boolean canSetRallyPoint_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canSetRallyPosition_native(long pointer);
+
+    private native boolean canSetRallyPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSetRallyUnit_native(long pointer);
+
+    private native boolean canSetRallyUnit_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canMove_native(long pointer);
+
+    private native boolean canMove_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canMoveGrouped_native(long pointer);
+
+    private native boolean canMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canPatrol_native(long pointer);
+
+    private native boolean canPatrol_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canPatrolGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canPatrolGrouped_native(long pointer);
+
+    private native boolean canPatrolGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canFollow_native(long pointer);
+
+    private native boolean canFollow_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canGather_native(long pointer);
+
+    private native boolean canGather_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canReturnCargo_native(long pointer);
+
+    private native boolean canReturnCargo_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canHoldPosition_native(long pointer);
+
+    private native boolean canHoldPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canStop_native(long pointer);
+
+    private native boolean canStop_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRepair_native(long pointer);
+
+    private native boolean canRepair_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canBurrow_native(long pointer);
+
+    private native boolean canBurrow_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnburrow_native(long pointer);
+
+    private native boolean canUnburrow_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCloak_native(long pointer);
+
+    private native boolean canCloak_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canDecloak_native(long pointer);
+
+    private native boolean canDecloak_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSiege_native(long pointer);
+
+    private native boolean canSiege_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnsiege_native(long pointer);
+
+    private native boolean canUnsiege_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLift_native(long pointer);
+
+    private native boolean canLift_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLand_native(long pointer);
+
+    private native boolean canLand_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLand_native(long pointer, TilePosition target, boolean checkCanIssueCommandType);
+
+    private native boolean canLand_native(long pointer, TilePosition target);
+
+    private native boolean canLand_native(long pointer, TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canLoad_native(long pointer);
+
+    private native boolean canLoad_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUnloadWithOrWithoutTarget_native(long pointer);
+
+    private native boolean canUnloadWithOrWithoutTarget_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnloadAtPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType);
+
+    private native boolean canUnloadAtPosition_native(long pointer, Position targDropPos);
+
+    private native boolean canUnloadAtPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUnload_native(long pointer);
+
+    private native boolean canUnload_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUnloadAll_native(long pointer);
+
+    private native boolean canUnloadAll_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnloadAllPosition_native(long pointer);
+
+    private native boolean canUnloadAllPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnloadAllPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType);
+
+    private native boolean canUnloadAllPosition_native(long pointer, Position targDropPos);
+
+    private native boolean canUnloadAllPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canRightClick_native(long pointer);
+
+    private native boolean canRightClick_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canRightClickGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickGrouped_native(long pointer);
+
+    private native boolean canRightClickGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickPosition_native(long pointer);
+
+    private native boolean canRightClickPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRightClickPositionGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickPositionGrouped_native(long pointer);
+
+    private native boolean canRightClickPositionGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickUnit_native(long pointer);
+
+    private native boolean canRightClickUnit_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canHaltConstruction_native(long pointer);
+
+    private native boolean canHaltConstruction_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelConstruction_native(long pointer);
+
+    private native boolean canCancelConstruction_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelAddon_native(long pointer);
+
+    private native boolean canCancelAddon_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelTrain_native(long pointer);
+
+    private native boolean canCancelTrain_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelTrainSlot_native(long pointer);
+
+    private native boolean canCancelTrainSlot_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelTrainSlot_native(long pointer, int slot, boolean checkCanIssueCommandType);
+
+    private native boolean canCancelTrainSlot_native(long pointer, int slot);
+
+    private native boolean canCancelTrainSlot_native(long pointer, int slot, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canCancelMorph_native(long pointer);
+
+    private native boolean canCancelMorph_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelResearch_native(long pointer);
+
+    private native boolean canCancelResearch_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelUpgrade_native(long pointer);
+
+    private native boolean canCancelUpgrade_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, TechType tech);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target);
+
+    private native boolean canUseTech_native(long pointer, TechType tech);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechWithoutTarget_native(long pointer, TechType tech);
+
+    private native boolean canUseTechWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target, boolean checkTargetsPositions);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canPlaceCOP_native(long pointer);
+
+    private native boolean canPlaceCOP_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canPlaceCOP_native(long pointer, TilePosition target, boolean checkCanIssueCommandType);
+
+    private native boolean canPlaceCOP_native(long pointer, TilePosition target);
+
+    private native boolean canPlaceCOP_native(long pointer, TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+
+}
diff --git a/generated/bwapi/UnitCommand.java b/generated/bwapi/UnitCommand.java
new file mode 100644
index 0000000..5c2f96a
--- /dev/null
+++ b/generated/bwapi/UnitCommand.java
@@ -0,0 +1,219 @@
+package bwapi;
+
+
+public class UnitCommand {
+
+    public static native UnitCommand attack(Unit unit, PositionOrUnit target);
+
+    public static native UnitCommand attack(Unit unit, PositionOrUnit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand build(Unit unit, TilePosition target, UnitType type);
+
+    public static native UnitCommand buildAddon(Unit unit, UnitType type);
+
+    public static native UnitCommand train(Unit unit, UnitType type);
+
+    public static native UnitCommand morph(Unit unit, UnitType type);
+
+    public static native UnitCommand research(Unit unit, TechType tech);
+
+    public static native UnitCommand upgrade(Unit unit, UpgradeType upgrade);
+
+    public static native UnitCommand setRallyPoint(Unit unit, PositionOrUnit target);
+
+    public static native UnitCommand move(Unit unit, Position target);
+
+    public static native UnitCommand move(Unit unit, Position target, boolean shiftQueueCommand);
+
+    public static native UnitCommand patrol(Unit unit, Position target);
+
+    public static native UnitCommand patrol(Unit unit, Position target, boolean shiftQueueCommand);
+
+    public static native UnitCommand holdPosition(Unit unit);
+
+    public static native UnitCommand holdPosition(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand stop(Unit unit);
+
+    public static native UnitCommand stop(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand follow(Unit unit, Unit target);
+
+    public static native UnitCommand follow(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand gather(Unit unit, Unit target);
+
+    public static native UnitCommand gather(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand returnCargo(Unit unit);
+
+    public static native UnitCommand returnCargo(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand repair(Unit unit, Unit target);
+
+    public static native UnitCommand repair(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand burrow(Unit unit);
+
+    public static native UnitCommand unburrow(Unit unit);
+
+    public static native UnitCommand cloak(Unit unit);
+
+    public static native UnitCommand decloak(Unit unit);
+
+    public static native UnitCommand siege(Unit unit);
+
+    public static native UnitCommand unsiege(Unit unit);
+
+    public static native UnitCommand lift(Unit unit);
+
+    public static native UnitCommand land(Unit unit, TilePosition target);
+
+    public static native UnitCommand load(Unit unit, Unit target);
+
+    public static native UnitCommand load(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand unload(Unit unit, Unit target);
+
+    public static native UnitCommand unloadAll(Unit unit);
+
+    public static native UnitCommand unloadAll(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand unloadAll(Unit unit, Position target);
+
+    public static native UnitCommand unloadAll(Unit unit, Position target, boolean shiftQueueCommand);
+
+    public static native UnitCommand rightClick(Unit unit, PositionOrUnit target);
+
+    public static native UnitCommand rightClick(Unit unit, PositionOrUnit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand haltConstruction(Unit unit);
+
+    public static native UnitCommand cancelConstruction(Unit unit);
+
+    public static native UnitCommand cancelAddon(Unit unit);
+
+    public static native UnitCommand cancelTrain(Unit unit);
+
+    public static native UnitCommand cancelTrain(Unit unit, int slot);
+
+    public static native UnitCommand cancelMorph(Unit unit);
+
+    public static native UnitCommand cancelResearch(Unit unit);
+
+    public static native UnitCommand cancelUpgrade(Unit unit);
+
+    public static native UnitCommand useTech(Unit unit, TechType tech);
+
+    public static native UnitCommand useTech(Unit unit, TechType tech, PositionOrUnit target);
+
+    public static native UnitCommand placeCOP(Unit unit, TilePosition target);
+
+    private Unit unit;
+
+    private UnitCommandType unitCommandType;
+
+    private Unit target;
+
+    private int x, y;
+
+    private int extra;
+
+    private UnitCommand(Unit unit, UnitCommandType unitCommandType, Unit target, int x, int y, int extra) {
+        this.unit = unit;
+        this.unitCommandType = unitCommandType;
+        this.target = target;
+        this.x = x;
+        this.y = y;
+        this.extra = extra;
+    }
+
+    public Unit getUnit() {
+        return unit;
+    }
+
+    public UnitCommandType getUnitCommandType() {
+        return unitCommandType;
+    }
+
+    public Unit getTarget() {
+        return target;
+    }
+
+
+
+    public int getSlot() {
+        if (unitCommandType == UnitCommandType.None) {
+            return extra;
+        }
+        return -1;
+    }
+
+    public Position getTargetPosition() {
+        if (unitCommandType == UnitCommandType.Build ||
+                unitCommandType == UnitCommandType.Land ||
+                unitCommandType == UnitCommandType.Place_COP) {
+            return new Position(x * 32, y * 32);
+        }
+        return new Position(x, y);
+    }
+
+    public TilePosition getTargetTilePosition() {
+        if (unitCommandType == UnitCommandType.Build ||
+                unitCommandType == UnitCommandType.Land ||
+                unitCommandType == UnitCommandType.Place_COP) {
+            return new TilePosition(x, y);
+        }
+        return new TilePosition(x / 32, y / 32);
+    }
+
+    public boolean isQueued() {
+        if (unitCommandType == UnitCommandType.Attack_Move ||
+                unitCommandType == UnitCommandType.Attack_Unit ||
+                unitCommandType == UnitCommandType.Move ||
+                unitCommandType == UnitCommandType.Patrol ||
+                unitCommandType == UnitCommandType.Hold_Position ||
+                unitCommandType == UnitCommandType.Stop ||
+                unitCommandType == UnitCommandType.Follow ||
+                unitCommandType == UnitCommandType.Gather ||
+                unitCommandType == UnitCommandType.Return_Cargo ||
+                unitCommandType == UnitCommandType.Repair ||
+                unitCommandType == UnitCommandType.Load ||
+                unitCommandType == UnitCommandType.Unload_All ||
+                unitCommandType == UnitCommandType.Unload_All_Position ||
+                unitCommandType == UnitCommandType.Right_Click_Position ||
+                unitCommandType == UnitCommandType.Right_Click_Unit) {
+            return extra != 0;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof UnitCommand)) return false;
+
+        UnitCommand that = (UnitCommand) o;
+
+        if (extra != that.extra) return false;
+        if (x != that.x) return false;
+        if (y != that.y) return false;
+        if (target != null ? !target.equals(that.target) : that.target != null) return false;
+        if (unit != null ? !unit.equals(that.unit) : that.unit != null) return false;
+        if (unitCommandType != null ? !unitCommandType.equals(that.unitCommandType) : that.unitCommandType != null)
+            return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = unit != null ? unit.hashCode() : 0;
+        result = 31 * result + (unitCommandType != null ? unitCommandType.hashCode() : 0);
+        result = 31 * result + (target != null ? target.hashCode() : 0);
+        result = 31 * result + x;
+        result = 31 * result + y;
+        result = 31 * result + extra;
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/UnitCommandType.java b/generated/bwapi/UnitCommandType.java
new file mode 100644
index 0000000..574ff1e
--- /dev/null
+++ b/generated/bwapi/UnitCommandType.java
@@ -0,0 +1,132 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitCommandType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static UnitCommandType Attack_Move;
+
+    public static UnitCommandType Attack_Unit;
+
+    public static UnitCommandType Build;
+
+    public static UnitCommandType Build_Addon;
+
+    public static UnitCommandType Train;
+
+    public static UnitCommandType Morph;
+
+    public static UnitCommandType Research;
+
+    public static UnitCommandType Upgrade;
+
+    public static UnitCommandType Set_Rally_Position;
+
+    public static UnitCommandType Set_Rally_Unit;
+
+    public static UnitCommandType Move;
+
+    public static UnitCommandType Patrol;
+
+    public static UnitCommandType Hold_Position;
+
+    public static UnitCommandType Stop;
+
+    public static UnitCommandType Follow;
+
+    public static UnitCommandType Gather;
+
+    public static UnitCommandType Return_Cargo;
+
+    public static UnitCommandType Repair;
+
+    public static UnitCommandType Burrow;
+
+    public static UnitCommandType Unburrow;
+
+    public static UnitCommandType Cloak;
+
+    public static UnitCommandType Decloak;
+
+    public static UnitCommandType Siege;
+
+    public static UnitCommandType Unsiege;
+
+    public static UnitCommandType Lift;
+
+    public static UnitCommandType Land;
+
+    public static UnitCommandType Load;
+
+    public static UnitCommandType Unload;
+
+    public static UnitCommandType Unload_All;
+
+    public static UnitCommandType Unload_All_Position;
+
+    public static UnitCommandType Right_Click_Position;
+
+    public static UnitCommandType Right_Click_Unit;
+
+    public static UnitCommandType Halt_Construction;
+
+    public static UnitCommandType Cancel_Construction;
+
+    public static UnitCommandType Cancel_Addon;
+
+    public static UnitCommandType Cancel_Train;
+
+    public static UnitCommandType Cancel_Train_Slot;
+
+    public static UnitCommandType Cancel_Morph;
+
+    public static UnitCommandType Cancel_Research;
+
+    public static UnitCommandType Cancel_Upgrade;
+
+    public static UnitCommandType Use_Tech;
+
+    public static UnitCommandType Use_Tech_Position;
+
+    public static UnitCommandType Use_Tech_Unit;
+
+    public static UnitCommandType Place_COP;
+
+    public static UnitCommandType None;
+
+    public static UnitCommandType Unknown;
+
+
+    private static Map<Long, UnitCommandType> instances = new HashMap<Long, UnitCommandType>();
+
+    private UnitCommandType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitCommandType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnitCommandType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitCommandType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/UnitFilter.java b/generated/bwapi/UnitFilter.java
new file mode 100644
index 0000000..02f0911
--- /dev/null
+++ b/generated/bwapi/UnitFilter.java
@@ -0,0 +1,31 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitFilter {
+
+
+    private static Map<Long, UnitFilter> instances = new HashMap<Long, UnitFilter>();
+
+    private UnitFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitFilter get(long pointer) {
+        UnitFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi/UnitSizeType.java b/generated/bwapi/UnitSizeType.java
new file mode 100644
index 0000000..23955df
--- /dev/null
+++ b/generated/bwapi/UnitSizeType.java
@@ -0,0 +1,52 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitSizeType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static UnitSizeType Independent;
+
+    public static UnitSizeType Small;
+
+    public static UnitSizeType Medium;
+
+    public static UnitSizeType Large;
+
+    public static UnitSizeType None;
+
+    public static UnitSizeType Unknown;
+
+
+    private static Map<Long, UnitSizeType> instances = new HashMap<Long, UnitSizeType>();
+
+    private UnitSizeType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitSizeType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnitSizeType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitSizeType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/UnitType.java b/generated/bwapi/UnitType.java
new file mode 100644
index 0000000..d70d74a
--- /dev/null
+++ b/generated/bwapi/UnitType.java
@@ -0,0 +1,894 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public TechType requiredTech() {
+        return requiredTech_native(pointer);
+    }
+
+    public TechType cloakingTech() {
+        return cloakingTech_native(pointer);
+    }
+
+    public UpgradeType armorUpgrade() {
+        return armorUpgrade_native(pointer);
+    }
+
+    public int maxHitPoints() {
+        return maxHitPoints_native(pointer);
+    }
+
+    public int maxShields() {
+        return maxShields_native(pointer);
+    }
+
+    public int maxEnergy() {
+        return maxEnergy_native(pointer);
+    }
+
+    public int armor() {
+        return armor_native(pointer);
+    }
+
+    public int mineralPrice() {
+        return mineralPrice_native(pointer);
+    }
+
+    public int gasPrice() {
+        return gasPrice_native(pointer);
+    }
+
+    public int buildTime() {
+        return buildTime_native(pointer);
+    }
+
+    public int supplyRequired() {
+        return supplyRequired_native(pointer);
+    }
+
+    public int supplyProvided() {
+        return supplyProvided_native(pointer);
+    }
+
+    public int spaceRequired() {
+        return spaceRequired_native(pointer);
+    }
+
+    public int spaceProvided() {
+        return spaceProvided_native(pointer);
+    }
+
+    public int buildScore() {
+        return buildScore_native(pointer);
+    }
+
+    public int destroyScore() {
+        return destroyScore_native(pointer);
+    }
+
+    public UnitSizeType size() {
+        return size_native(pointer);
+    }
+
+    public int tileWidth() {
+        return tileWidth_native(pointer);
+    }
+
+    public int tileHeight() {
+        return tileHeight_native(pointer);
+    }
+
+    public TilePosition tileSize() {
+        return tileSize_native(pointer);
+    }
+
+    public int dimensionLeft() {
+        return dimensionLeft_native(pointer);
+    }
+
+    public int dimensionUp() {
+        return dimensionUp_native(pointer);
+    }
+
+    public int dimensionRight() {
+        return dimensionRight_native(pointer);
+    }
+
+    public int dimensionDown() {
+        return dimensionDown_native(pointer);
+    }
+
+    public int width() {
+        return width_native(pointer);
+    }
+
+    public int height() {
+        return height_native(pointer);
+    }
+
+    public int seekRange() {
+        return seekRange_native(pointer);
+    }
+
+    public int sightRange() {
+        return sightRange_native(pointer);
+    }
+
+    public WeaponType groundWeapon() {
+        return groundWeapon_native(pointer);
+    }
+
+    public int maxGroundHits() {
+        return maxGroundHits_native(pointer);
+    }
+
+    public WeaponType airWeapon() {
+        return airWeapon_native(pointer);
+    }
+
+    public int maxAirHits() {
+        return maxAirHits_native(pointer);
+    }
+
+    public double topSpeed() {
+        return topSpeed_native(pointer);
+    }
+
+    public int acceleration() {
+        return acceleration_native(pointer);
+    }
+
+    public int haltDistance() {
+        return haltDistance_native(pointer);
+    }
+
+    public int turnRadius() {
+        return turnRadius_native(pointer);
+    }
+
+    public boolean canProduce() {
+        return canProduce_native(pointer);
+    }
+
+    public boolean canAttack() {
+        return canAttack_native(pointer);
+    }
+
+    public boolean canMove() {
+        return canMove_native(pointer);
+    }
+
+    public boolean isFlyer() {
+        return isFlyer_native(pointer);
+    }
+
+    public boolean regeneratesHP() {
+        return regeneratesHP_native(pointer);
+    }
+
+    public boolean isSpellcaster() {
+        return isSpellcaster_native(pointer);
+    }
+
+    public boolean hasPermanentCloak() {
+        return hasPermanentCloak_native(pointer);
+    }
+
+    public boolean isInvincible() {
+        return isInvincible_native(pointer);
+    }
+
+    public boolean isOrganic() {
+        return isOrganic_native(pointer);
+    }
+
+    public boolean isMechanical() {
+        return isMechanical_native(pointer);
+    }
+
+    public boolean isRobotic() {
+        return isRobotic_native(pointer);
+    }
+
+    public boolean isDetector() {
+        return isDetector_native(pointer);
+    }
+
+    public boolean isResourceContainer() {
+        return isResourceContainer_native(pointer);
+    }
+
+    public boolean isResourceDepot() {
+        return isResourceDepot_native(pointer);
+    }
+
+    public boolean isRefinery() {
+        return isRefinery_native(pointer);
+    }
+
+    public boolean isWorker() {
+        return isWorker_native(pointer);
+    }
+
+    public boolean requiresPsi() {
+        return requiresPsi_native(pointer);
+    }
+
+    public boolean requiresCreep() {
+        return requiresCreep_native(pointer);
+    }
+
+    public boolean isTwoUnitsInOneEgg() {
+        return isTwoUnitsInOneEgg_native(pointer);
+    }
+
+    public boolean isBurrowable() {
+        return isBurrowable_native(pointer);
+    }
+
+    public boolean isCloakable() {
+        return isCloakable_native(pointer);
+    }
+
+    public boolean isBuilding() {
+        return isBuilding_native(pointer);
+    }
+
+    public boolean isAddon() {
+        return isAddon_native(pointer);
+    }
+
+    public boolean isFlyingBuilding() {
+        return isFlyingBuilding_native(pointer);
+    }
+
+    public boolean isNeutral() {
+        return isNeutral_native(pointer);
+    }
+
+    public boolean isHero() {
+        return isHero_native(pointer);
+    }
+
+    public boolean isPowerup() {
+        return isPowerup_native(pointer);
+    }
+
+    public boolean isBeacon() {
+        return isBeacon_native(pointer);
+    }
+
+    public boolean isFlagBeacon() {
+        return isFlagBeacon_native(pointer);
+    }
+
+    public boolean isSpecialBuilding() {
+        return isSpecialBuilding_native(pointer);
+    }
+
+    public boolean isSpell() {
+        return isSpell_native(pointer);
+    }
+
+    public boolean producesLarva() {
+        return producesLarva_native(pointer);
+    }
+
+    public boolean isMineralField() {
+        return isMineralField_native(pointer);
+    }
+
+    public boolean isCritter() {
+        return isCritter_native(pointer);
+    }
+
+    public boolean canBuildAddon() {
+        return canBuildAddon_native(pointer);
+    }
+
+    public static UnitType Terran_Marine;
+
+    public static UnitType Terran_Ghost;
+
+    public static UnitType Terran_Vulture;
+
+    public static UnitType Terran_Goliath;
+
+    public static UnitType Terran_Siege_Tank_Tank_Mode;
+
+    public static UnitType Terran_SCV;
+
+    public static UnitType Terran_Wraith;
+
+    public static UnitType Terran_Science_Vessel;
+
+    public static UnitType Hero_Gui_Montag;
+
+    public static UnitType Terran_Dropship;
+
+    public static UnitType Terran_Battlecruiser;
+
+    public static UnitType Terran_Vulture_Spider_Mine;
+
+    public static UnitType Terran_Nuclear_Missile;
+
+    public static UnitType Terran_Civilian;
+
+    public static UnitType Hero_Sarah_Kerrigan;
+
+    public static UnitType Hero_Alan_Schezar;
+
+    public static UnitType Hero_Jim_Raynor_Vulture;
+
+    public static UnitType Hero_Jim_Raynor_Marine;
+
+    public static UnitType Hero_Tom_Kazansky;
+
+    public static UnitType Hero_Magellan;
+
+    public static UnitType Hero_Edmund_Duke_Tank_Mode;
+
+    public static UnitType Hero_Edmund_Duke_Siege_Mode;
+
+    public static UnitType Hero_Arcturus_Mengsk;
+
+    public static UnitType Hero_Hyperion;
+
+    public static UnitType Hero_Norad_II;
+
+    public static UnitType Terran_Siege_Tank_Siege_Mode;
+
+    public static UnitType Terran_Firebat;
+
+    public static UnitType Spell_Scanner_Sweep;
+
+    public static UnitType Terran_Medic;
+
+    public static UnitType Zerg_Larva;
+
+    public static UnitType Zerg_Egg;
+
+    public static UnitType Zerg_Zergling;
+
+    public static UnitType Zerg_Hydralisk;
+
+    public static UnitType Zerg_Ultralisk;
+
+    public static UnitType Zerg_Broodling;
+
+    public static UnitType Zerg_Drone;
+
+    public static UnitType Zerg_Overlord;
+
+    public static UnitType Zerg_Mutalisk;
+
+    public static UnitType Zerg_Guardian;
+
+    public static UnitType Zerg_Queen;
+
+    public static UnitType Zerg_Defiler;
+
+    public static UnitType Zerg_Scourge;
+
+    public static UnitType Hero_Torrasque;
+
+    public static UnitType Hero_Matriarch;
+
+    public static UnitType Zerg_Infested_Terran;
+
+    public static UnitType Hero_Infested_Kerrigan;
+
+    public static UnitType Hero_Unclean_One;
+
+    public static UnitType Hero_Hunter_Killer;
+
+    public static UnitType Hero_Devouring_One;
+
+    public static UnitType Hero_Kukulza_Mutalisk;
+
+    public static UnitType Hero_Kukulza_Guardian;
+
+    public static UnitType Hero_Yggdrasill;
+
+    public static UnitType Terran_Valkyrie;
+
+    public static UnitType Zerg_Cocoon;
+
+    public static UnitType Protoss_Corsair;
+
+    public static UnitType Protoss_Dark_Templar;
+
+    public static UnitType Zerg_Devourer;
+
+    public static UnitType Protoss_Dark_Archon;
+
+    public static UnitType Protoss_Probe;
+
+    public static UnitType Protoss_Zealot;
+
+    public static UnitType Protoss_Dragoon;
+
+    public static UnitType Protoss_High_Templar;
+
+    public static UnitType Protoss_Archon;
+
+    public static UnitType Protoss_Shuttle;
+
+    public static UnitType Protoss_Scout;
+
+    public static UnitType Protoss_Arbiter;
+
+    public static UnitType Protoss_Carrier;
+
+    public static UnitType Protoss_Interceptor;
+
+    public static UnitType Hero_Dark_Templar;
+
+    public static UnitType Hero_Zeratul;
+
+    public static UnitType Hero_Tassadar_Zeratul_Archon;
+
+    public static UnitType Hero_Fenix_Zealot;
+
+    public static UnitType Hero_Fenix_Dragoon;
+
+    public static UnitType Hero_Tassadar;
+
+    public static UnitType Hero_Mojo;
+
+    public static UnitType Hero_Warbringer;
+
+    public static UnitType Hero_Gantrithor;
+
+    public static UnitType Protoss_Reaver;
+
+    public static UnitType Protoss_Observer;
+
+    public static UnitType Protoss_Scarab;
+
+    public static UnitType Hero_Danimoth;
+
+    public static UnitType Hero_Aldaris;
+
+    public static UnitType Hero_Artanis;
+
+    public static UnitType Critter_Rhynadon;
+
+    public static UnitType Critter_Bengalaas;
+
+    public static UnitType Special_Cargo_Ship;
+
+    public static UnitType Special_Mercenary_Gunship;
+
+    public static UnitType Critter_Scantid;
+
+    public static UnitType Critter_Kakaru;
+
+    public static UnitType Critter_Ragnasaur;
+
+    public static UnitType Critter_Ursadon;
+
+    public static UnitType Zerg_Lurker_Egg;
+
+    public static UnitType Hero_Raszagal;
+
+    public static UnitType Hero_Samir_Duran;
+
+    public static UnitType Hero_Alexei_Stukov;
+
+    public static UnitType Special_Map_Revealer;
+
+    public static UnitType Hero_Gerard_DuGalle;
+
+    public static UnitType Zerg_Lurker;
+
+    public static UnitType Hero_Infested_Duran;
+
+    public static UnitType Spell_Disruption_Web;
+
+    public static UnitType Terran_Command_Center;
+
+    public static UnitType Terran_Comsat_Station;
+
+    public static UnitType Terran_Nuclear_Silo;
+
+    public static UnitType Terran_Supply_Depot;
+
+    public static UnitType Terran_Refinery;
+
+    public static UnitType Terran_Barracks;
+
+    public static UnitType Terran_Academy;
+
+    public static UnitType Terran_Factory;
+
+    public static UnitType Terran_Starport;
+
+    public static UnitType Terran_Control_Tower;
+
+    public static UnitType Terran_Science_Facility;
+
+    public static UnitType Terran_Covert_Ops;
+
+    public static UnitType Terran_Physics_Lab;
+
+    public static UnitType Terran_Machine_Shop;
+
+    public static UnitType Terran_Engineering_Bay;
+
+    public static UnitType Terran_Armory;
+
+    public static UnitType Terran_Missile_Turret;
+
+    public static UnitType Terran_Bunker;
+
+    public static UnitType Special_Crashed_Norad_II;
+
+    public static UnitType Special_Ion_Cannon;
+
+    public static UnitType Powerup_Uraj_Crystal;
+
+    public static UnitType Powerup_Khalis_Crystal;
+
+    public static UnitType Zerg_Infested_Command_Center;
+
+    public static UnitType Zerg_Hatchery;
+
+    public static UnitType Zerg_Lair;
+
+    public static UnitType Zerg_Hive;
+
+    public static UnitType Zerg_Nydus_Canal;
+
+    public static UnitType Zerg_Hydralisk_Den;
+
+    public static UnitType Zerg_Defiler_Mound;
+
+    public static UnitType Zerg_Greater_Spire;
+
+    public static UnitType Zerg_Queens_Nest;
+
+    public static UnitType Zerg_Evolution_Chamber;
+
+    public static UnitType Zerg_Ultralisk_Cavern;
+
+    public static UnitType Zerg_Spire;
+
+    public static UnitType Zerg_Spawning_Pool;
+
+    public static UnitType Zerg_Creep_Colony;
+
+    public static UnitType Zerg_Spore_Colony;
+
+    public static UnitType Zerg_Sunken_Colony;
+
+    public static UnitType Special_Overmind_With_Shell;
+
+    public static UnitType Special_Overmind;
+
+    public static UnitType Zerg_Extractor;
+
+    public static UnitType Special_Mature_Chrysalis;
+
+    public static UnitType Special_Cerebrate;
+
+    public static UnitType Special_Cerebrate_Daggoth;
+
+    public static UnitType Protoss_Nexus;
+
+    public static UnitType Protoss_Robotics_Facility;
+
+    public static UnitType Protoss_Pylon;
+
+    public static UnitType Protoss_Assimilator;
+
+    public static UnitType Protoss_Observatory;
+
+    public static UnitType Protoss_Gateway;
+
+    public static UnitType Protoss_Photon_Cannon;
+
+    public static UnitType Protoss_Citadel_of_Adun;
+
+    public static UnitType Protoss_Cybernetics_Core;
+
+    public static UnitType Protoss_Templar_Archives;
+
+    public static UnitType Protoss_Forge;
+
+    public static UnitType Protoss_Stargate;
+
+    public static UnitType Special_Stasis_Cell_Prison;
+
+    public static UnitType Protoss_Fleet_Beacon;
+
+    public static UnitType Protoss_Arbiter_Tribunal;
+
+    public static UnitType Protoss_Robotics_Support_Bay;
+
+    public static UnitType Protoss_Shield_Battery;
+
+    public static UnitType Special_Khaydarin_Crystal_Form;
+
+    public static UnitType Special_Protoss_Temple;
+
+    public static UnitType Special_XelNaga_Temple;
+
+    public static UnitType Resource_Mineral_Field;
+
+    public static UnitType Resource_Mineral_Field_Type_2;
+
+    public static UnitType Resource_Mineral_Field_Type_3;
+
+    public static UnitType Special_Independant_Starport;
+
+    public static UnitType Resource_Vespene_Geyser;
+
+    public static UnitType Special_Warp_Gate;
+
+    public static UnitType Special_Psi_Disrupter;
+
+    public static UnitType Special_Zerg_Beacon;
+
+    public static UnitType Special_Terran_Beacon;
+
+    public static UnitType Special_Protoss_Beacon;
+
+    public static UnitType Special_Zerg_Flag_Beacon;
+
+    public static UnitType Special_Terran_Flag_Beacon;
+
+    public static UnitType Special_Protoss_Flag_Beacon;
+
+    public static UnitType Special_Power_Generator;
+
+    public static UnitType Special_Overmind_Cocoon;
+
+    public static UnitType Spell_Dark_Swarm;
+
+    public static UnitType Special_Floor_Missile_Trap;
+
+    public static UnitType Special_Floor_Hatch;
+
+    public static UnitType Special_Upper_Level_Door;
+
+    public static UnitType Special_Right_Upper_Level_Door;
+
+    public static UnitType Special_Pit_Door;
+
+    public static UnitType Special_Right_Pit_Door;
+
+    public static UnitType Special_Floor_Gun_Trap;
+
+    public static UnitType Special_Wall_Missile_Trap;
+
+    public static UnitType Special_Wall_Flame_Trap;
+
+    public static UnitType Special_Right_Wall_Missile_Trap;
+
+    public static UnitType Special_Right_Wall_Flame_Trap;
+
+    public static UnitType Special_Start_Location;
+
+    public static UnitType Powerup_Flag;
+
+    public static UnitType Powerup_Young_Chrysalis;
+
+    public static UnitType Powerup_Psi_Emitter;
+
+    public static UnitType Powerup_Data_Disk;
+
+    public static UnitType Powerup_Khaydarin_Crystal;
+
+    public static UnitType Powerup_Mineral_Cluster_Type_1;
+
+    public static UnitType Powerup_Mineral_Cluster_Type_2;
+
+    public static UnitType Powerup_Protoss_Gas_Orb_Type_1;
+
+    public static UnitType Powerup_Protoss_Gas_Orb_Type_2;
+
+    public static UnitType Powerup_Zerg_Gas_Sac_Type_1;
+
+    public static UnitType Powerup_Zerg_Gas_Sac_Type_2;
+
+    public static UnitType Powerup_Terran_Gas_Tank_Type_1;
+
+    public static UnitType Powerup_Terran_Gas_Tank_Type_2;
+
+    public static UnitType None;
+
+    public static UnitType AllUnits;
+
+    public static UnitType Men;
+
+    public static UnitType Buildings;
+
+    public static UnitType Factories;
+
+    public static UnitType Unknown;
+
+
+    private static Map<Long, UnitType> instances = new HashMap<Long, UnitType>();
+
+    private UnitType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnitType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native TechType requiredTech_native(long pointer);
+
+    private native TechType cloakingTech_native(long pointer);
+
+    private native UpgradeType armorUpgrade_native(long pointer);
+
+    private native int maxHitPoints_native(long pointer);
+
+    private native int maxShields_native(long pointer);
+
+    private native int maxEnergy_native(long pointer);
+
+    private native int armor_native(long pointer);
+
+    private native int mineralPrice_native(long pointer);
+
+    private native int gasPrice_native(long pointer);
+
+    private native int buildTime_native(long pointer);
+
+    private native int supplyRequired_native(long pointer);
+
+    private native int supplyProvided_native(long pointer);
+
+    private native int spaceRequired_native(long pointer);
+
+    private native int spaceProvided_native(long pointer);
+
+    private native int buildScore_native(long pointer);
+
+    private native int destroyScore_native(long pointer);
+
+    private native UnitSizeType size_native(long pointer);
+
+    private native int tileWidth_native(long pointer);
+
+    private native int tileHeight_native(long pointer);
+
+    private native TilePosition tileSize_native(long pointer);
+
+    private native int dimensionLeft_native(long pointer);
+
+    private native int dimensionUp_native(long pointer);
+
+    private native int dimensionRight_native(long pointer);
+
+    private native int dimensionDown_native(long pointer);
+
+    private native int width_native(long pointer);
+
+    private native int height_native(long pointer);
+
+    private native int seekRange_native(long pointer);
+
+    private native int sightRange_native(long pointer);
+
+    private native WeaponType groundWeapon_native(long pointer);
+
+    private native int maxGroundHits_native(long pointer);
+
+    private native WeaponType airWeapon_native(long pointer);
+
+    private native int maxAirHits_native(long pointer);
+
+    private native double topSpeed_native(long pointer);
+
+    private native int acceleration_native(long pointer);
+
+    private native int haltDistance_native(long pointer);
+
+    private native int turnRadius_native(long pointer);
+
+    private native boolean canProduce_native(long pointer);
+
+    private native boolean canAttack_native(long pointer);
+
+    private native boolean canMove_native(long pointer);
+
+    private native boolean isFlyer_native(long pointer);
+
+    private native boolean regeneratesHP_native(long pointer);
+
+    private native boolean isSpellcaster_native(long pointer);
+
+    private native boolean hasPermanentCloak_native(long pointer);
+
+    private native boolean isInvincible_native(long pointer);
+
+    private native boolean isOrganic_native(long pointer);
+
+    private native boolean isMechanical_native(long pointer);
+
+    private native boolean isRobotic_native(long pointer);
+
+    private native boolean isDetector_native(long pointer);
+
+    private native boolean isResourceContainer_native(long pointer);
+
+    private native boolean isResourceDepot_native(long pointer);
+
+    private native boolean isRefinery_native(long pointer);
+
+    private native boolean isWorker_native(long pointer);
+
+    private native boolean requiresPsi_native(long pointer);
+
+    private native boolean requiresCreep_native(long pointer);
+
+    private native boolean isTwoUnitsInOneEgg_native(long pointer);
+
+    private native boolean isBurrowable_native(long pointer);
+
+    private native boolean isCloakable_native(long pointer);
+
+    private native boolean isBuilding_native(long pointer);
+
+    private native boolean isAddon_native(long pointer);
+
+    private native boolean isFlyingBuilding_native(long pointer);
+
+    private native boolean isNeutral_native(long pointer);
+
+    private native boolean isHero_native(long pointer);
+
+    private native boolean isPowerup_native(long pointer);
+
+    private native boolean isBeacon_native(long pointer);
+
+    private native boolean isFlagBeacon_native(long pointer);
+
+    private native boolean isSpecialBuilding_native(long pointer);
+
+    private native boolean isSpell_native(long pointer);
+
+    private native boolean producesLarva_native(long pointer);
+
+    private native boolean isMineralField_native(long pointer);
+
+    private native boolean isCritter_native(long pointer);
+
+    private native boolean canBuildAddon_native(long pointer);
+
+
+}
diff --git a/generated/bwapi/Unitset.java b/generated/bwapi/Unitset.java
new file mode 100644
index 0000000..082c44b
--- /dev/null
+++ b/generated/bwapi/Unitset.java
@@ -0,0 +1,358 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Unitset {
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public List<Unit> getLoadedUnits() {
+        return getLoadedUnits_native(pointer);
+    }
+
+    public List<Unit> getInterceptors() {
+        return getInterceptors_native(pointer);
+    }
+
+    public List<Unit> getLarva() {
+        return getLarva_native(pointer);
+    }
+
+    public boolean issueCommand(UnitCommand command) {
+        return issueCommand_native(pointer, command);
+    }
+
+    public boolean attack(PositionOrUnit target) {
+        return attack_native(pointer, target);
+    }
+
+    public boolean attack(PositionOrUnit target, boolean shiftQueueCommand) {
+        return attack_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean build(UnitType type) {
+        return build_native(pointer, type);
+    }
+
+    public boolean build(UnitType type, TilePosition target) {
+        return build_native(pointer, type, target);
+    }
+
+    public boolean buildAddon(UnitType type) {
+        return buildAddon_native(pointer, type);
+    }
+
+    public boolean train(UnitType type) {
+        return train_native(pointer, type);
+    }
+
+    public boolean morph(UnitType type) {
+        return morph_native(pointer, type);
+    }
+
+    public boolean setRallyPoint(PositionOrUnit target) {
+        return setRallyPoint_native(pointer, target);
+    }
+
+    public boolean move(Position target) {
+        return move_native(pointer, target);
+    }
+
+    public boolean move(Position target, boolean shiftQueueCommand) {
+        return move_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean patrol(Position target) {
+        return patrol_native(pointer, target);
+    }
+
+    public boolean patrol(Position target, boolean shiftQueueCommand) {
+        return patrol_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean holdPosition() {
+        return holdPosition_native(pointer);
+    }
+
+    public boolean holdPosition(boolean shiftQueueCommand) {
+        return holdPosition_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean stop() {
+        return stop_native(pointer);
+    }
+
+    public boolean stop(boolean shiftQueueCommand) {
+        return stop_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean follow(Unit target) {
+        return follow_native(pointer, target);
+    }
+
+    public boolean follow(Unit target, boolean shiftQueueCommand) {
+        return follow_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean gather(Unit target) {
+        return gather_native(pointer, target);
+    }
+
+    public boolean gather(Unit target, boolean shiftQueueCommand) {
+        return gather_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean returnCargo() {
+        return returnCargo_native(pointer);
+    }
+
+    public boolean returnCargo(boolean shiftQueueCommand) {
+        return returnCargo_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean repair(Unit target) {
+        return repair_native(pointer, target);
+    }
+
+    public boolean repair(Unit target, boolean shiftQueueCommand) {
+        return repair_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean burrow() {
+        return burrow_native(pointer);
+    }
+
+    public boolean unburrow() {
+        return unburrow_native(pointer);
+    }
+
+    public boolean cloak() {
+        return cloak_native(pointer);
+    }
+
+    public boolean decloak() {
+        return decloak_native(pointer);
+    }
+
+    public boolean siege() {
+        return siege_native(pointer);
+    }
+
+    public boolean unsiege() {
+        return unsiege_native(pointer);
+    }
+
+    public boolean lift() {
+        return lift_native(pointer);
+    }
+
+    public boolean load(Unit target) {
+        return load_native(pointer, target);
+    }
+
+    public boolean load(Unit target, boolean shiftQueueCommand) {
+        return load_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean unloadAll() {
+        return unloadAll_native(pointer);
+    }
+
+    public boolean unloadAll(boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean unloadAll(Position target) {
+        return unloadAll_native(pointer, target);
+    }
+
+    public boolean unloadAll(Position target, boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean rightClick(PositionOrUnit target) {
+        return rightClick_native(pointer, target);
+    }
+
+    public boolean rightClick(PositionOrUnit target, boolean shiftQueueCommand) {
+        return rightClick_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean haltConstruction() {
+        return haltConstruction_native(pointer);
+    }
+
+    public boolean cancelConstruction() {
+        return cancelConstruction_native(pointer);
+    }
+
+    public boolean cancelAddon() {
+        return cancelAddon_native(pointer);
+    }
+
+    public boolean cancelTrain() {
+        return cancelTrain_native(pointer);
+    }
+
+    public boolean cancelTrain(int slot) {
+        return cancelTrain_native(pointer, slot);
+    }
+
+    public boolean cancelMorph() {
+        return cancelMorph_native(pointer);
+    }
+
+    public boolean cancelResearch() {
+        return cancelResearch_native(pointer);
+    }
+
+    public boolean cancelUpgrade() {
+        return cancelUpgrade_native(pointer);
+    }
+
+    public boolean useTech(TechType tech) {
+        return useTech_native(pointer, tech);
+    }
+
+    public boolean useTech(TechType tech, PositionOrUnit target) {
+        return useTech_native(pointer, tech, target);
+    }
+
+
+    private static Map<Long, Unitset> instances = new HashMap<Long, Unitset>();
+
+    private Unitset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Unitset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Unitset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Unitset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native Position getPosition_native(long pointer);
+
+    private native List<Unit> getLoadedUnits_native(long pointer);
+
+    private native List<Unit> getInterceptors_native(long pointer);
+
+    private native List<Unit> getLarva_native(long pointer);
+
+    private native boolean issueCommand_native(long pointer, UnitCommand command);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean build_native(long pointer, UnitType type);
+
+    private native boolean build_native(long pointer, UnitType type, TilePosition target);
+
+    private native boolean buildAddon_native(long pointer, UnitType type);
+
+    private native boolean train_native(long pointer, UnitType type);
+
+    private native boolean morph_native(long pointer, UnitType type);
+
+    private native boolean setRallyPoint_native(long pointer, PositionOrUnit target);
+
+    private native boolean move_native(long pointer, Position target);
+
+    private native boolean move_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean patrol_native(long pointer, Position target);
+
+    private native boolean patrol_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean holdPosition_native(long pointer);
+
+    private native boolean holdPosition_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean stop_native(long pointer);
+
+    private native boolean stop_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean follow_native(long pointer, Unit target);
+
+    private native boolean follow_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean gather_native(long pointer, Unit target);
+
+    private native boolean gather_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean returnCargo_native(long pointer);
+
+    private native boolean returnCargo_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean repair_native(long pointer, Unit target);
+
+    private native boolean repair_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean burrow_native(long pointer);
+
+    private native boolean unburrow_native(long pointer);
+
+    private native boolean cloak_native(long pointer);
+
+    private native boolean decloak_native(long pointer);
+
+    private native boolean siege_native(long pointer);
+
+    private native boolean unsiege_native(long pointer);
+
+    private native boolean lift_native(long pointer);
+
+    private native boolean load_native(long pointer, Unit target);
+
+    private native boolean load_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean unloadAll_native(long pointer);
+
+    private native boolean unloadAll_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean unloadAll_native(long pointer, Position target);
+
+    private native boolean unloadAll_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean haltConstruction_native(long pointer);
+
+    private native boolean cancelConstruction_native(long pointer);
+
+    private native boolean cancelAddon_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer, int slot);
+
+    private native boolean cancelMorph_native(long pointer);
+
+    private native boolean cancelResearch_native(long pointer);
+
+    private native boolean cancelUpgrade_native(long pointer);
+
+    private native boolean useTech_native(long pointer, TechType tech);
+
+    private native boolean useTech_native(long pointer, TechType tech, PositionOrUnit target);
+
+
+}
diff --git a/generated/bwapi/UpgradeType.java b/generated/bwapi/UpgradeType.java
new file mode 100644
index 0000000..4daeb47
--- /dev/null
+++ b/generated/bwapi/UpgradeType.java
@@ -0,0 +1,230 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UpgradeType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public int mineralPrice() {
+        return mineralPrice_native(pointer);
+    }
+
+    public int mineralPrice(int level) {
+        return mineralPrice_native(pointer, level);
+    }
+
+    public int mineralPriceFactor() {
+        return mineralPriceFactor_native(pointer);
+    }
+
+    public int gasPrice() {
+        return gasPrice_native(pointer);
+    }
+
+    public int gasPrice(int level) {
+        return gasPrice_native(pointer, level);
+    }
+
+    public int gasPriceFactor() {
+        return gasPriceFactor_native(pointer);
+    }
+
+    public int upgradeTime() {
+        return upgradeTime_native(pointer);
+    }
+
+    public int upgradeTime(int level) {
+        return upgradeTime_native(pointer, level);
+    }
+
+    public int upgradeTimeFactor() {
+        return upgradeTimeFactor_native(pointer);
+    }
+
+    public int maxRepeats() {
+        return maxRepeats_native(pointer);
+    }
+
+    public UnitType whatUpgrades() {
+        return whatUpgrades_native(pointer);
+    }
+
+    public UnitType whatsRequired() {
+        return whatsRequired_native(pointer);
+    }
+
+    public UnitType whatsRequired(int level) {
+        return whatsRequired_native(pointer, level);
+    }
+
+    public static UpgradeType Terran_Infantry_Armor;
+
+    public static UpgradeType Terran_Vehicle_Plating;
+
+    public static UpgradeType Terran_Ship_Plating;
+
+    public static UpgradeType Zerg_Carapace;
+
+    public static UpgradeType Zerg_Flyer_Carapace;
+
+    public static UpgradeType Protoss_Ground_Armor;
+
+    public static UpgradeType Protoss_Air_Armor;
+
+    public static UpgradeType Terran_Infantry_Weapons;
+
+    public static UpgradeType Terran_Vehicle_Weapons;
+
+    public static UpgradeType Terran_Ship_Weapons;
+
+    public static UpgradeType Zerg_Melee_Attacks;
+
+    public static UpgradeType Zerg_Missile_Attacks;
+
+    public static UpgradeType Zerg_Flyer_Attacks;
+
+    public static UpgradeType Protoss_Ground_Weapons;
+
+    public static UpgradeType Protoss_Air_Weapons;
+
+    public static UpgradeType Protoss_Plasma_Shields;
+
+    public static UpgradeType U_238_Shells;
+
+    public static UpgradeType Ion_Thrusters;
+
+    public static UpgradeType Titan_Reactor;
+
+    public static UpgradeType Ocular_Implants;
+
+    public static UpgradeType Moebius_Reactor;
+
+    public static UpgradeType Apollo_Reactor;
+
+    public static UpgradeType Colossus_Reactor;
+
+    public static UpgradeType Ventral_Sacs;
+
+    public static UpgradeType Antennae;
+
+    public static UpgradeType Pneumatized_Carapace;
+
+    public static UpgradeType Metabolic_Boost;
+
+    public static UpgradeType Adrenal_Glands;
+
+    public static UpgradeType Muscular_Augments;
+
+    public static UpgradeType Grooved_Spines;
+
+    public static UpgradeType Gamete_Meiosis;
+
+    public static UpgradeType Metasynaptic_Node;
+
+    public static UpgradeType Singularity_Charge;
+
+    public static UpgradeType Leg_Enhancements;
+
+    public static UpgradeType Scarab_Damage;
+
+    public static UpgradeType Reaver_Capacity;
+
+    public static UpgradeType Gravitic_Drive;
+
+    public static UpgradeType Sensor_Array;
+
+    public static UpgradeType Gravitic_Boosters;
+
+    public static UpgradeType Khaydarin_Amulet;
+
+    public static UpgradeType Apial_Sensors;
+
+    public static UpgradeType Gravitic_Thrusters;
+
+    public static UpgradeType Carrier_Capacity;
+
+    public static UpgradeType Khaydarin_Core;
+
+    public static UpgradeType Argus_Jewel;
+
+    public static UpgradeType Argus_Talisman;
+
+    public static UpgradeType Caduceus_Reactor;
+
+    public static UpgradeType Chitinous_Plating;
+
+    public static UpgradeType Anabolic_Synthesis;
+
+    public static UpgradeType Charon_Boosters;
+
+    public static UpgradeType Upgrade_60;
+
+    public static UpgradeType None;
+
+    public static UpgradeType Unknown;
+
+
+    private static Map<Long, UpgradeType> instances = new HashMap<Long, UpgradeType>();
+
+    private UpgradeType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UpgradeType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UpgradeType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UpgradeType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native int mineralPrice_native(long pointer);
+
+    private native int mineralPrice_native(long pointer, int level);
+
+    private native int mineralPriceFactor_native(long pointer);
+
+    private native int gasPrice_native(long pointer);
+
+    private native int gasPrice_native(long pointer, int level);
+
+    private native int gasPriceFactor_native(long pointer);
+
+    private native int upgradeTime_native(long pointer);
+
+    private native int upgradeTime_native(long pointer, int level);
+
+    private native int upgradeTimeFactor_native(long pointer);
+
+    private native int maxRepeats_native(long pointer);
+
+    private native UnitType whatUpgrades_native(long pointer);
+
+    private native UnitType whatsRequired_native(long pointer);
+
+    private native UnitType whatsRequired_native(long pointer, int level);
+
+
+}
diff --git a/generated/bwapi/Utils.java b/generated/bwapi/Utils.java
new file mode 100644
index 0000000..a597123
--- /dev/null
+++ b/generated/bwapi/Utils.java
@@ -0,0 +1,52 @@
+package bwapi;
+
+import java.lang.String;
+import java.lang.System;
+
+/**
+ *
+ */
+public class Utils {
+
+    public static final byte Previous = 0x01;
+    public static final byte Cyan = 0x02;
+    public static final byte Yellow = 0x03;
+    public static final byte White = 0x04;
+    public static final byte Grey = 0x05;
+    public static final byte Red = 0x06;
+    public static final byte Green = 0x07;
+    public static final byte Red_P1 = 0x08;
+    public static final byte Tab = 0x09;
+    public static final byte Newline = 0x0A;
+    public static final byte Invisible_no_override = 0x0B;
+    public static final byte Remove_beyond = 0x0C;
+    public static final byte Clear_formatting = 0x0D;
+    public static final byte Blue = 0x0E;
+    public static final byte Teal = 0x0F;
+    public static final byte Purple = 0x10;
+    public static final byte Orange = 0x11;
+    public static final byte Right_Align = 0x12;
+    public static final byte Center_Align = 0x13;
+    public static final byte Invisible = 0x14;
+    public static final byte Brown = 0x15;
+    public static final byte White_p7 = 0x16;
+    public static final byte Yellow_p8 = 0x17;
+    public static final byte Green_p9 = 0x18;
+    public static final byte Brighter_Yellow = 0x19;
+    public static final byte Cyan_default = 0x1A;
+    public static final byte Pinkish = 0x1B;
+    public static final byte Dark_Cyan = 0x1C;
+    public static final byte Greygreen = 0x1D;
+    public static final byte Bluegrey = 0x1E;
+    public static final byte Turquoise = 0x1F;
+
+    public static String formatText(String text, byte format){
+        byte[] textData = text.getBytes();
+        int textDataLength = text.length();
+
+        byte[] newTextData = new byte[textDataLength + 1];
+        newTextData[0] = format;
+        System.arraycopy(textData, 0, newTextData, 1, textDataLength);
+        return new String(newTextData);
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/WalkPosition.java b/generated/bwapi/WalkPosition.java
new file mode 100644
index 0000000..acd2f15
--- /dev/null
+++ b/generated/bwapi/WalkPosition.java
@@ -0,0 +1,83 @@
+package bwapi;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+public class WalkPosition extends AbstractPoint<WalkPosition>{
+
+    private int x, y;
+
+    public WalkPosition(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public String toString() {
+        return "[" + x + ", " + y + "]";
+    }
+
+    public native boolean isValid();
+
+    public native WalkPosition makeValid();
+
+    public native int getApproxDistance(WalkPosition position);
+
+    public native double getLength();
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public static WalkPosition Invalid;
+
+    public static WalkPosition None;
+
+    public static WalkPosition Unknown;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof WalkPosition)) return false;
+
+        WalkPosition position = (WalkPosition) o;
+
+        if (x != position.x) return false;
+        if (y != position.y) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x;
+        result = 31 * result + y;
+        return result;
+    }
+
+
+    private static Map<Long, WalkPosition> instances = new HashMap<Long, WalkPosition>();
+
+    private WalkPosition(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static WalkPosition get(long pointer) {
+        WalkPosition instance = instances.get(pointer);
+        if (instance == null) {
+            instance = new WalkPosition(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    public WalkPosition getPoint(){
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi/WeaponType.java b/generated/bwapi/WeaponType.java
new file mode 100644
index 0000000..9d81447
--- /dev/null
+++ b/generated/bwapi/WeaponType.java
@@ -0,0 +1,382 @@
+package bwapi;
+
+import bwapi.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class WeaponType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public TechType getTech() {
+        return getTech_native(pointer);
+    }
+
+    public UnitType whatUses() {
+        return whatUses_native(pointer);
+    }
+
+    public int damageAmount() {
+        return damageAmount_native(pointer);
+    }
+
+    public int damageBonus() {
+        return damageBonus_native(pointer);
+    }
+
+    public int damageCooldown() {
+        return damageCooldown_native(pointer);
+    }
+
+    public int damageFactor() {
+        return damageFactor_native(pointer);
+    }
+
+    public UpgradeType upgradeType() {
+        return upgradeType_native(pointer);
+    }
+
+    public DamageType damageType() {
+        return damageType_native(pointer);
+    }
+
+    public ExplosionType explosionType() {
+        return explosionType_native(pointer);
+    }
+
+    public int minRange() {
+        return minRange_native(pointer);
+    }
+
+    public int maxRange() {
+        return maxRange_native(pointer);
+    }
+
+    public int innerSplashRadius() {
+        return innerSplashRadius_native(pointer);
+    }
+
+    public int medianSplashRadius() {
+        return medianSplashRadius_native(pointer);
+    }
+
+    public int outerSplashRadius() {
+        return outerSplashRadius_native(pointer);
+    }
+
+    public boolean targetsAir() {
+        return targetsAir_native(pointer);
+    }
+
+    public boolean targetsGround() {
+        return targetsGround_native(pointer);
+    }
+
+    public boolean targetsMechanical() {
+        return targetsMechanical_native(pointer);
+    }
+
+    public boolean targetsOrganic() {
+        return targetsOrganic_native(pointer);
+    }
+
+    public boolean targetsNonBuilding() {
+        return targetsNonBuilding_native(pointer);
+    }
+
+    public boolean targetsNonRobotic() {
+        return targetsNonRobotic_native(pointer);
+    }
+
+    public boolean targetsTerrain() {
+        return targetsTerrain_native(pointer);
+    }
+
+    public boolean targetsOrgOrMech() {
+        return targetsOrgOrMech_native(pointer);
+    }
+
+    public boolean targetsOwn() {
+        return targetsOwn_native(pointer);
+    }
+
+    public static WeaponType Gauss_Rifle;
+
+    public static WeaponType Gauss_Rifle_Jim_Raynor;
+
+    public static WeaponType C_10_Canister_Rifle;
+
+    public static WeaponType C_10_Canister_Rifle_Sarah_Kerrigan;
+
+    public static WeaponType C_10_Canister_Rifle_Samir_Duran;
+
+    public static WeaponType C_10_Canister_Rifle_Infested_Duran;
+
+    public static WeaponType C_10_Canister_Rifle_Alexei_Stukov;
+
+    public static WeaponType Fragmentation_Grenade;
+
+    public static WeaponType Fragmentation_Grenade_Jim_Raynor;
+
+    public static WeaponType Spider_Mines;
+
+    public static WeaponType Twin_Autocannons;
+
+    public static WeaponType Twin_Autocannons_Alan_Schezar;
+
+    public static WeaponType Hellfire_Missile_Pack;
+
+    public static WeaponType Hellfire_Missile_Pack_Alan_Schezar;
+
+    public static WeaponType Arclite_Cannon;
+
+    public static WeaponType Arclite_Cannon_Edmund_Duke;
+
+    public static WeaponType Fusion_Cutter;
+
+    public static WeaponType Gemini_Missiles;
+
+    public static WeaponType Gemini_Missiles_Tom_Kazansky;
+
+    public static WeaponType Burst_Lasers;
+
+    public static WeaponType Burst_Lasers_Tom_Kazansky;
+
+    public static WeaponType ATS_Laser_Battery;
+
+    public static WeaponType ATS_Laser_Battery_Hero;
+
+    public static WeaponType ATS_Laser_Battery_Hyperion;
+
+    public static WeaponType ATA_Laser_Battery;
+
+    public static WeaponType ATA_Laser_Battery_Hero;
+
+    public static WeaponType ATA_Laser_Battery_Hyperion;
+
+    public static WeaponType Flame_Thrower;
+
+    public static WeaponType Flame_Thrower_Gui_Montag;
+
+    public static WeaponType Arclite_Shock_Cannon;
+
+    public static WeaponType Arclite_Shock_Cannon_Edmund_Duke;
+
+    public static WeaponType Longbolt_Missile;
+
+    public static WeaponType Claws;
+
+    public static WeaponType Claws_Devouring_One;
+
+    public static WeaponType Claws_Infested_Kerrigan;
+
+    public static WeaponType Needle_Spines;
+
+    public static WeaponType Needle_Spines_Hunter_Killer;
+
+    public static WeaponType Kaiser_Blades;
+
+    public static WeaponType Kaiser_Blades_Torrasque;
+
+    public static WeaponType Toxic_Spores;
+
+    public static WeaponType Spines;
+
+    public static WeaponType Acid_Spore;
+
+    public static WeaponType Acid_Spore_Kukulza;
+
+    public static WeaponType Glave_Wurm;
+
+    public static WeaponType Glave_Wurm_Kukulza;
+
+    public static WeaponType Seeker_Spores;
+
+    public static WeaponType Subterranean_Tentacle;
+
+    public static WeaponType Suicide_Infested_Terran;
+
+    public static WeaponType Suicide_Scourge;
+
+    public static WeaponType Particle_Beam;
+
+    public static WeaponType Psi_Blades;
+
+    public static WeaponType Psi_Blades_Fenix;
+
+    public static WeaponType Phase_Disruptor;
+
+    public static WeaponType Phase_Disruptor_Fenix;
+
+    public static WeaponType Psi_Assault;
+
+    public static WeaponType Psionic_Shockwave;
+
+    public static WeaponType Psionic_Shockwave_TZ_Archon;
+
+    public static WeaponType Dual_Photon_Blasters;
+
+    public static WeaponType Dual_Photon_Blasters_Mojo;
+
+    public static WeaponType Dual_Photon_Blasters_Artanis;
+
+    public static WeaponType Anti_Matter_Missiles;
+
+    public static WeaponType Anti_Matter_Missiles_Mojo;
+
+    public static WeaponType Anti_Matter_Missiles_Artanis;
+
+    public static WeaponType Phase_Disruptor_Cannon;
+
+    public static WeaponType Phase_Disruptor_Cannon_Danimoth;
+
+    public static WeaponType Pulse_Cannon;
+
+    public static WeaponType STS_Photon_Cannon;
+
+    public static WeaponType STA_Photon_Cannon;
+
+    public static WeaponType Scarab;
+
+    public static WeaponType Neutron_Flare;
+
+    public static WeaponType Halo_Rockets;
+
+    public static WeaponType Corrosive_Acid;
+
+    public static WeaponType Subterranean_Spines;
+
+    public static WeaponType Warp_Blades;
+
+    public static WeaponType Warp_Blades_Hero;
+
+    public static WeaponType Warp_Blades_Zeratul;
+
+    public static WeaponType Independant_Laser_Battery;
+
+    public static WeaponType Twin_Autocannons_Floor_Trap;
+
+    public static WeaponType Hellfire_Missile_Pack_Wall_Trap;
+
+    public static WeaponType Flame_Thrower_Wall_Trap;
+
+    public static WeaponType Hellfire_Missile_Pack_Floor_Trap;
+
+    public static WeaponType Yamato_Gun;
+
+    public static WeaponType Nuclear_Strike;
+
+    public static WeaponType Lockdown;
+
+    public static WeaponType EMP_Shockwave;
+
+    public static WeaponType Irradiate;
+
+    public static WeaponType Parasite;
+
+    public static WeaponType Spawn_Broodlings;
+
+    public static WeaponType Ensnare;
+
+    public static WeaponType Dark_Swarm;
+
+    public static WeaponType Plague;
+
+    public static WeaponType Consume;
+
+    public static WeaponType Stasis_Field;
+
+    public static WeaponType Psionic_Storm;
+
+    public static WeaponType Disruption_Web;
+
+    public static WeaponType Restoration;
+
+    public static WeaponType Mind_Control;
+
+    public static WeaponType Feedback;
+
+    public static WeaponType Optical_Flare;
+
+    public static WeaponType Maelstrom;
+
+    public static WeaponType None;
+
+    public static WeaponType Unknown;
+
+
+    private static Map<Long, WeaponType> instances = new HashMap<Long, WeaponType>();
+
+    private WeaponType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static WeaponType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        WeaponType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new WeaponType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native TechType getTech_native(long pointer);
+
+    private native UnitType whatUses_native(long pointer);
+
+    private native int damageAmount_native(long pointer);
+
+    private native int damageBonus_native(long pointer);
+
+    private native int damageCooldown_native(long pointer);
+
+    private native int damageFactor_native(long pointer);
+
+    private native UpgradeType upgradeType_native(long pointer);
+
+    private native DamageType damageType_native(long pointer);
+
+    private native ExplosionType explosionType_native(long pointer);
+
+    private native int minRange_native(long pointer);
+
+    private native int maxRange_native(long pointer);
+
+    private native int innerSplashRadius_native(long pointer);
+
+    private native int medianSplashRadius_native(long pointer);
+
+    private native int outerSplashRadius_native(long pointer);
+
+    private native boolean targetsAir_native(long pointer);
+
+    private native boolean targetsGround_native(long pointer);
+
+    private native boolean targetsMechanical_native(long pointer);
+
+    private native boolean targetsOrganic_native(long pointer);
+
+    private native boolean targetsNonBuilding_native(long pointer);
+
+    private native boolean targetsNonRobotic_native(long pointer);
+
+    private native boolean targetsTerrain_native(long pointer);
+
+    private native boolean targetsOrgOrMech_native(long pointer);
+
+    private native boolean targetsOwn_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/AIModule.java b/generated/bwapi4/AIModule.java
new file mode 100644
index 0000000..ad9e0b6
--- /dev/null
+++ b/generated/bwapi4/AIModule.java
@@ -0,0 +1,130 @@
+package bwapi4;
+
+import bwapi4.BWEventListener;
+
+/**
+ * This class receives all events from Broodwar.
+ * To process them, receive an AIModule's instance from {@link Mirror} and call {@link #setEventListener(bwapi.BWEventListener)}
+ * to set you own {@link BWEventListener listener}.
+ * There's also a stub class ({@link DefaultBWListener}) provided, so you don't have to implement all of the methods.
+ */
+public class AIModule {
+
+    AIModule(){}
+
+    private BWEventListener eventListener;
+
+    public void setEventListener(BWEventListener eventListener) {
+        this.eventListener = eventListener;
+    }
+
+    public void onStart() {
+        if (eventListener != null) {
+            eventListener.onStart();
+        }
+    }
+
+    public void onEnd(boolean isWinner) {
+        if (eventListener != null) {
+            eventListener.onEnd(isWinner);
+        }
+    }
+
+    public void onFrame() {
+        if (eventListener != null) {
+            eventListener.onFrame();
+        }
+    }
+
+    public void onSendText(String text) {
+        if (eventListener != null)
+        {
+            eventListener.onSendText(text);
+        }
+    }
+
+    public void onReceiveText(Player player, String text) {
+        if (eventListener != null) {
+            eventListener.onReceiveText(player, text);
+        }
+    }
+
+    public void onPlayerLeft(Player player) {
+        if (eventListener != null) {
+            eventListener.onPlayerLeft(player);
+        }
+    }
+
+    public void onNukeDetect(Position target) {
+        if (eventListener != null) {
+            eventListener.onNukeDetect(target);
+        }
+    }
+
+    public void onUnitDiscover(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitDiscover(unit);
+        }
+    }
+
+    public void onUnitEvade(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitEvade(unit);
+        }
+    }
+
+    public void onUnitShow(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitShow(unit);
+        }
+    }
+
+    public void onUnitHide(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitHide(unit);
+        }
+    }
+
+    public void onUnitCreate(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitCreate(unit);
+        }
+    }
+
+    public void onUnitDestroy(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitDestroy(unit);
+        }
+    }
+
+    public void onUnitMorph(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitMorph(unit);
+        }
+    }
+
+    public void onUnitRenegade(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitRenegade(unit);
+        }
+    }
+
+    public void onSaveGame(String gameName) {
+        if (eventListener != null) {
+            eventListener.onSaveGame(gameName);
+        }
+    }
+
+    public void onUnitComplete(Unit unit) {
+        if (eventListener != null) {
+            eventListener.onUnitComplete(unit);
+        }
+    }
+
+    public void onPlayerDropped(Player player) {
+        if (eventListener != null) {
+            eventListener.onPlayerDropped(player);
+        }
+    }
+
+}
diff --git a/generated/bwapi4/AbstractPoint.java b/generated/bwapi4/AbstractPoint.java
new file mode 100644
index 0000000..df6fb93
--- /dev/null
+++ b/generated/bwapi4/AbstractPoint.java
@@ -0,0 +1,30 @@
+package bwapi4;
+
+/**
+ * Common ancestor for location based objects to simplify distance computation.
+ * This will be refactored into interface with default methods when java 8 becomes widely used.
+ *
+ * Idea by Rafa³ Poniatowski
+ */
+public abstract class AbstractPoint<T extends AbstractPoint> {
+
+    public abstract T getPoint();
+
+    public int getX(){
+        return getPoint().getX();
+    }
+
+    public int getY(){
+        return getPoint().getY();
+    }
+
+    public double getDistance(AbstractPoint<T> otherPosition) {
+        return getDistance(otherPosition.getX(), otherPosition.getY());
+    }
+
+    public double getDistance(int x, int y) {
+        double dx = x - getX();
+        double dy = y - getY();
+        return Math.sqrt(dx * dx + dy * dy);
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/BWEventListener.java b/generated/bwapi4/BWEventListener.java
new file mode 100644
index 0000000..6f9f031
--- /dev/null
+++ b/generated/bwapi4/BWEventListener.java
@@ -0,0 +1,53 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * Implement this interface and call {@link AIModule#setEventListener(bwapi.BWEventListener)} to receive all of the in game events.
+ */
+public interface BWEventListener {
+
+    public void onStart();
+
+    public void onEnd(boolean isWinner);
+
+    public void onFrame();
+
+    public void onSendText(String text);
+
+    public void onReceiveText(Player player, String text);
+
+    public void onPlayerLeft(Player player);
+
+    public void onNukeDetect(Position target);
+
+    public void onUnitDiscover(Unit unit);
+
+    public void onUnitEvade(Unit unit);
+
+    public void onUnitShow(Unit unit);
+
+    public void onUnitHide(Unit unit);
+
+    public void onUnitCreate(Unit unit);
+
+    public void onUnitDestroy(Unit unit);
+
+    public void onUnitMorph(Unit unit);
+
+    public void onUnitRenegade(Unit unit);
+
+    public void onSaveGame(String gameName);
+
+    public void onUnitComplete(Unit unit);
+
+    public void onPlayerDropped(Player player);
+
+}
+
+
diff --git a/generated/bwapi4/BestFilter.java b/generated/bwapi4/BestFilter.java
new file mode 100644
index 0000000..76c858f
--- /dev/null
+++ b/generated/bwapi4/BestFilter.java
@@ -0,0 +1,34 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class BestFilter {
+
+
+    private static Map<Long, BestFilter> instances = new HashMap<Long, BestFilter>();
+
+    private BestFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static BestFilter get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        BestFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new BestFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi4/BestUnitFilter.java b/generated/bwapi4/BestUnitFilter.java
new file mode 100644
index 0000000..4a90ead
--- /dev/null
+++ b/generated/bwapi4/BestUnitFilter.java
@@ -0,0 +1,31 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class BestUnitFilter {
+
+
+    private static Map<Long, BestUnitFilter> instances = new HashMap<Long, BestUnitFilter>();
+
+    private BestUnitFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static BestUnitFilter get(long pointer) {
+        BestUnitFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new BestUnitFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi4/Bullet.java b/generated/bwapi4/Bullet.java
new file mode 100644
index 0000000..36f2d48
--- /dev/null
+++ b/generated/bwapi4/Bullet.java
@@ -0,0 +1,118 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Bullet {
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public boolean exists() {
+        return exists_native(pointer);
+    }
+
+    public Player getPlayer() {
+        return getPlayer_native(pointer);
+    }
+
+    public BulletType getType() {
+        return getType_native(pointer);
+    }
+
+    public Unit getSource() {
+        return getSource_native(pointer);
+    }
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public double getAngle() {
+        return getAngle_native(pointer);
+    }
+
+    public double getVelocityX() {
+        return getVelocityX_native(pointer);
+    }
+
+    public double getVelocityY() {
+        return getVelocityY_native(pointer);
+    }
+
+    public Unit getTarget() {
+        return getTarget_native(pointer);
+    }
+
+    public Position getTargetPosition() {
+        return getTargetPosition_native(pointer);
+    }
+
+    public int getRemoveTimer() {
+        return getRemoveTimer_native(pointer);
+    }
+
+    public boolean isVisible() {
+        return isVisible_native(pointer);
+    }
+
+    public boolean isVisible(Player player) {
+        return isVisible_native(pointer, player);
+    }
+
+
+    private static Map<Long, Bullet> instances = new HashMap<Long, Bullet>();
+
+    private Bullet(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Bullet get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Bullet instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Bullet(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native boolean exists_native(long pointer);
+
+    private native Player getPlayer_native(long pointer);
+
+    private native BulletType getType_native(long pointer);
+
+    private native Unit getSource_native(long pointer);
+
+    private native Position getPosition_native(long pointer);
+
+    private native double getAngle_native(long pointer);
+
+    private native double getVelocityX_native(long pointer);
+
+    private native double getVelocityY_native(long pointer);
+
+    private native Unit getTarget_native(long pointer);
+
+    private native Position getTargetPosition_native(long pointer);
+
+    private native int getRemoveTimer_native(long pointer);
+
+    private native boolean isVisible_native(long pointer);
+
+    private native boolean isVisible_native(long pointer, Player player);
+
+
+}
diff --git a/generated/bwapi4/BulletType.java b/generated/bwapi4/BulletType.java
new file mode 100644
index 0000000..0dc217d
--- /dev/null
+++ b/generated/bwapi4/BulletType.java
@@ -0,0 +1,114 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class BulletType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static BulletType Melee;
+
+    public static BulletType Fusion_Cutter_Hit;
+
+    public static BulletType Gauss_Rifle_Hit;
+
+    public static BulletType C_10_Canister_Rifle_Hit;
+
+    public static BulletType Gemini_Missiles;
+
+    public static BulletType Fragmentation_Grenade;
+
+    public static BulletType Longbolt_Missile;
+
+    public static BulletType ATS_ATA_Laser_Battery;
+
+    public static BulletType Burst_Lasers;
+
+    public static BulletType Arclite_Shock_Cannon_Hit;
+
+    public static BulletType EMP_Missile;
+
+    public static BulletType Dual_Photon_Blasters_Hit;
+
+    public static BulletType Particle_Beam_Hit;
+
+    public static BulletType Anti_Matter_Missile;
+
+    public static BulletType Pulse_Cannon;
+
+    public static BulletType Psionic_Shockwave_Hit;
+
+    public static BulletType Psionic_Storm;
+
+    public static BulletType Yamato_Gun;
+
+    public static BulletType Phase_Disruptor;
+
+    public static BulletType STA_STS_Cannon_Overlay;
+
+    public static BulletType Sunken_Colony_Tentacle;
+
+    public static BulletType Acid_Spore;
+
+    public static BulletType Glave_Wurm;
+
+    public static BulletType Seeker_Spores;
+
+    public static BulletType Queen_Spell_Carrier;
+
+    public static BulletType Plague_Cloud;
+
+    public static BulletType Consume;
+
+    public static BulletType Ensnare;
+
+    public static BulletType Needle_Spine_Hit;
+
+    public static BulletType Invisible;
+
+    public static BulletType Optical_Flare_Grenade;
+
+    public static BulletType Halo_Rockets;
+
+    public static BulletType Subterranean_Spines;
+
+    public static BulletType Corrosive_Acid_Shot;
+
+    public static BulletType Neutron_Flare;
+
+    public static BulletType None;
+
+    public static BulletType Unknown;
+
+
+    private static Map<Long, BulletType> instances = new HashMap<Long, BulletType>();
+
+    private BulletType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static BulletType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        BulletType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new BulletType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Bulletset.java b/generated/bwapi4/Bulletset.java
new file mode 100644
index 0000000..7921ecd
--- /dev/null
+++ b/generated/bwapi4/Bulletset.java
@@ -0,0 +1,34 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Bulletset {
+
+
+    private static Map<Long, Bulletset> instances = new HashMap<Long, Bulletset>();
+
+    private Bulletset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Bulletset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Bulletset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Bulletset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi4/CenteredObject.java b/generated/bwapi4/CenteredObject.java
new file mode 100644
index 0000000..2a200ac
--- /dev/null
+++ b/generated/bwapi4/CenteredObject.java
@@ -0,0 +1,15 @@
+package bwapi4;
+
+import bwapi4.Position;
+
+/**
+ * Interrmediate class used to translate getPoint() calls to getCenter() calls.
+ */
+public abstract class CenteredObject extends AbstractPoint<Position> {
+
+    public Position getPoint(){
+        return getCenter();
+    }
+
+    public abstract Position getCenter();
+}
\ No newline at end of file
diff --git a/generated/bwapi4/Client.java b/generated/bwapi4/Client.java
new file mode 100644
index 0000000..6ea52ec
--- /dev/null
+++ b/generated/bwapi4/Client.java
@@ -0,0 +1,58 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Client {
+
+    public boolean isConnected() {
+        return isConnected_native(pointer);
+    }
+
+    public boolean connect() {
+        return connect_native(pointer);
+    }
+
+    public void disconnect() {
+        disconnect_native(pointer);
+    }
+
+    public void update() {
+        update_native(pointer);
+    }
+
+
+    private static Map<Long, Client> instances = new HashMap<Long, Client>();
+
+    private Client(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Client get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Client instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Client(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native boolean isConnected_native(long pointer);
+
+    private native boolean connect_native(long pointer);
+
+    private native void disconnect_native(long pointer);
+
+    private native void update_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Color.java b/generated/bwapi4/Color.java
new file mode 100644
index 0000000..e15c22a
--- /dev/null
+++ b/generated/bwapi4/Color.java
@@ -0,0 +1,73 @@
+package bwapi4;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Starcraft uses a 256 color palette to render everything,
+ * so the colors available for draw shapes using BWAPI is limited to the colors available in the <a href="http://bwapi.googlecode.com/svn/wiki/colorPalette.gif" target="_blank">Pallete</a>.
+ * Several predefined colors from the pallete are provided.
+ */
+public class Color {
+
+    private int r, g, b;
+
+    /**
+     * Create a color using the color in the palette that is closest to the RGB color specified. This will check a number of colors in the pallet to see which is closest to the specified color so this function is relatively slow.
+     * @param r
+     * @param g
+     * @param b
+     */
+    public Color(int r, int g, int b) {
+        this.r = r;
+        this.g = g;
+        this.b = b;
+    }
+
+    public static Color Red;
+
+    public static Color Blue;
+
+    public static Color Teal;
+
+    public static Color Purple;
+
+    public static Color Orange;
+
+    public static Color Brown;
+
+    public static Color White;
+
+    public static Color Yellow;
+
+    public static Color Green;
+
+    public static Color Cyan;
+
+    public static Color Black;
+
+    public static Color Grey;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Color)) return false;
+
+        Color color = (Color) o;
+
+        if (b != color.b) return false;
+        if (g != color.g) return false;
+        if (r != color.r) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = r;
+        result = 31 * result + g;
+        result = 31 * result + b;
+        return result;
+    }
+}
diff --git a/generated/bwapi4/CommandType/Enum.java b/generated/bwapi4/CommandType/Enum.java
new file mode 100644
index 0000000..b379559
--- /dev/null
+++ b/generated/bwapi4/CommandType/Enum.java
@@ -0,0 +1,41 @@
+package bwapi4.CommandType;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	None(0),
+	SetScreenPosition(1),
+	PingMinimap(2),
+	EnableFlag(3),
+	Printf(4),
+	SendText(5),
+	PauseGame(6),
+	ResumeGame(7),
+	LeaveGame(8),
+	RestartGame(9),
+	SetLocalSpeed(10),
+	SetLatCom(11),
+	SetGui(12),
+	SetFrameSkip(13),
+	SetMap(14),
+	SetAllies(15),
+	SetVision(16),
+	SetCommandOptimizerLevel(17);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/CompareFilter.java b/generated/bwapi4/CompareFilter.java
new file mode 100644
index 0000000..c4fa5a6
--- /dev/null
+++ b/generated/bwapi4/CompareFilter.java
@@ -0,0 +1,34 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class CompareFilter {
+
+
+    private static Map<Long, CompareFilter> instances = new HashMap<Long, CompareFilter>();
+
+    private CompareFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static CompareFilter get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        CompareFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new CompareFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi4/CoordinateType/Enum.java b/generated/bwapi4/CoordinateType/Enum.java
new file mode 100644
index 0000000..4c5bce5
--- /dev/null
+++ b/generated/bwapi4/CoordinateType/Enum.java
@@ -0,0 +1,27 @@
+package bwapi4.CoordinateType;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	None(0),
+	Screen(1),
+	Map(2),
+	Mouse(3);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/DamageType.java b/generated/bwapi4/DamageType.java
new file mode 100644
index 0000000..135d2ea
--- /dev/null
+++ b/generated/bwapi4/DamageType.java
@@ -0,0 +1,54 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class DamageType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static DamageType Independent;
+
+    public static DamageType Explosive;
+
+    public static DamageType Concussive;
+
+    public static DamageType Normal;
+
+    public static DamageType Ignore_Armor;
+
+    public static DamageType None;
+
+    public static DamageType Unknown;
+
+
+    private static Map<Long, DamageType> instances = new HashMap<Long, DamageType>();
+
+    private DamageType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static DamageType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        DamageType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new DamageType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/DefaultBWListener.java b/generated/bwapi4/DefaultBWListener.java
new file mode 100644
index 0000000..76df50e
--- /dev/null
+++ b/generated/bwapi4/DefaultBWListener.java
@@ -0,0 +1,103 @@
+package bwapi4;
+
+import bwapi4.BWEventListener;
+import bwapi4.Player;
+import bwapi4.Position;
+import bwapi4.Unit;
+
+/**
+ * A utility stub class providing a default implementation of {@link BWEventListener},
+ * override it's methods if you want to handle only some events.
+ */
+public class DefaultBWListener implements BWEventListener {
+
+    @Override
+    public void onStart() {
+
+    }
+
+    @Override
+    public void onEnd(boolean b) {
+
+    }
+
+    @Override
+    public void onFrame() {
+
+    }
+
+    @Override
+    public void onSendText(String s) {
+
+    }
+
+    @Override
+    public void onReceiveText(Player player, String s) {
+
+    }
+
+    @Override
+    public void onPlayerLeft(Player player) {
+
+    }
+
+    @Override
+    public void onNukeDetect(Position position) {
+
+    }
+
+    @Override
+    public void onUnitDiscover(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitEvade(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitShow(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitHide(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitCreate(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitDestroy(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitMorph(Unit unit) {
+
+    }
+
+    @Override
+    public void onUnitRenegade(Unit unit) {
+
+    }
+
+    @Override
+    public void onSaveGame(String s) {
+
+    }
+
+    @Override
+    public void onUnitComplete(Unit unit) {
+
+    }
+
+    @Override
+    public void onPlayerDropped(Player player) {
+
+    }
+}
diff --git a/generated/bwapi4/Enum/Enum.java b/generated/bwapi4/Enum/Enum.java
new file mode 100644
index 0000000..a655dc1
--- /dev/null
+++ b/generated/bwapi4/Enum/Enum.java
@@ -0,0 +1,126 @@
+package bwapi4.Enum;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	Gauss_Rifle(0),
+	Gauss_Rifle_Jim_Raynor(1),
+	C_10_Canister_Rifle(2),
+	C_10_Canister_Rifle_Sarah_Kerrigan(3),
+	Fragmentation_Grenade(4),
+	Fragmentation_Grenade_Jim_Raynor(5),
+	Spider_Mines(6),
+	Twin_Autocannons(7),
+	Hellfire_Missile_Pack(8),
+	Twin_Autocannons_Alan_Schezar(9),
+	Hellfire_Missile_Pack_Alan_Schezar(10),
+	Arclite_Cannon(11),
+	Arclite_Cannon_Edmund_Duke(12),
+	Fusion_Cutter(13),
+	Gemini_Missiles(15),
+	Burst_Lasers(16),
+	Gemini_Missiles_Tom_Kazansky(17),
+	Burst_Lasers_Tom_Kazansky(18),
+	ATS_Laser_Battery(19),
+	ATA_Laser_Battery(20),
+	ATS_Laser_Battery_Hero(21),
+	ATA_Laser_Battery_Hero(22),
+	ATS_Laser_Battery_Hyperion(23),
+	ATA_Laser_Battery_Hyperion(24),
+	Flame_Thrower(25),
+	Flame_Thrower_Gui_Montag(26),
+	Arclite_Shock_Cannon(27),
+	Arclite_Shock_Cannon_Edmund_Duke(28),
+	Longbolt_Missile(29),
+	Yamato_Gun(30),
+	Nuclear_Strike(31),
+	Lockdown(32),
+	EMP_Shockwave(33),
+	Irradiate(34),
+	Claws(35),
+	Claws_Devouring_One(36),
+	Claws_Infested_Kerrigan(37),
+	Needle_Spines(38),
+	Needle_Spines_Hunter_Killer(39),
+	Kaiser_Blades(40),
+	Kaiser_Blades_Torrasque(41),
+	Toxic_Spores(42),
+	Spines(43),
+	Acid_Spore(46),
+	Acid_Spore_Kukulza(47),
+	Glave_Wurm(48),
+	Glave_Wurm_Kukulza(49),
+	Seeker_Spores(52),
+	Subterranean_Tentacle(53),
+	Suicide_Infested_Terran(54),
+	Suicide_Scourge(55),
+	Parasite(56),
+	Spawn_Broodlings(57),
+	Ensnare(58),
+	Dark_Swarm(59),
+	Plague(60),
+	Consume(61),
+	Particle_Beam(62),
+	Psi_Blades(64),
+	Psi_Blades_Fenix(65),
+	Phase_Disruptor(66),
+	Phase_Disruptor_Fenix(67),
+	Psi_Assault(69),
+	Psionic_Shockwave(70),
+	Psionic_Shockwave_TZ_Archon(71),
+	Dual_Photon_Blasters(73),
+	Anti_Matter_Missiles(74),
+	Dual_Photon_Blasters_Mojo(75),
+	Anti_Matter_Missiles_Mojo(76),
+	Phase_Disruptor_Cannon(77),
+	Phase_Disruptor_Cannon_Danimoth(78),
+	Pulse_Cannon(79),
+	STS_Photon_Cannon(80),
+	STA_Photon_Cannon(81),
+	Scarab(82),
+	Stasis_Field(83),
+	Psionic_Storm(84),
+	Warp_Blades_Zeratul(85),
+	Warp_Blades_Hero(86),
+	Platform_Laser_Battery(92),
+	Independant_Laser_Battery(93),
+	Twin_Autocannons_Floor_Trap(96),
+	Hellfire_Missile_Pack_Wall_Trap(97),
+	Flame_Thrower_Wall_Trap(98),
+	Hellfire_Missile_Pack_Floor_Trap(99),
+	Neutron_Flare(100),
+	Disruption_Web(101),
+	Restoration(102),
+	Halo_Rockets(103),
+	Corrosive_Acid(104),
+	Mind_Control(105),
+	Feedback(106),
+	Optical_Flare(107),
+	Maelstrom(108),
+	Subterranean_Spines(109),
+	Warp_Blades(111),
+	C_10_Canister_Rifle_Samir_Duran(112),
+	C_10_Canister_Rifle_Infested_Duran(113),
+	Dual_Photon_Blasters_Artanis(114),
+	Anti_Matter_Missiles_Artanis(115),
+	C_10_Canister_Rifle_Alexei_Stukov(116),
+	None(130),
+	Unknown(131);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/Error.java b/generated/bwapi4/Error.java
new file mode 100644
index 0000000..29412a9
--- /dev/null
+++ b/generated/bwapi4/Error.java
@@ -0,0 +1,96 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Error {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static Error Unit_Does_Not_Exist;
+
+    public static Error Unit_Not_Visible;
+
+    public static Error Unit_Not_Owned;
+
+    public static Error Unit_Busy;
+
+    public static Error Incompatible_UnitType;
+
+    public static Error Incompatible_TechType;
+
+    public static Error Incompatible_State;
+
+    public static Error Already_Researched;
+
+    public static Error Fully_Upgraded;
+
+    public static Error Currently_Researching;
+
+    public static Error Currently_Upgrading;
+
+    public static Error Insufficient_Minerals;
+
+    public static Error Insufficient_Gas;
+
+    public static Error Insufficient_Supply;
+
+    public static Error Insufficient_Energy;
+
+    public static Error Insufficient_Tech;
+
+    public static Error Insufficient_Ammo;
+
+    public static Error Insufficient_Space;
+
+    public static Error Invalid_Tile_Position;
+
+    public static Error Unbuildable_Location;
+
+    public static Error Unreachable_Location;
+
+    public static Error Out_Of_Range;
+
+    public static Error Unable_To_Hit;
+
+    public static Error Access_Denied;
+
+    public static Error File_Not_Found;
+
+    public static Error Invalid_Parameter;
+
+    public static Error None;
+
+    public static Error Unknown;
+
+
+    private static Map<Long, Error> instances = new HashMap<Long, Error>();
+
+    private Error(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Error get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Error instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Error(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Event.java b/generated/bwapi4/Event.java
new file mode 100644
index 0000000..362ca82
--- /dev/null
+++ b/generated/bwapi4/Event.java
@@ -0,0 +1,64 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Event {
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public String getText() {
+        return getText_native(pointer);
+    }
+
+    public Unit getUnit() {
+        return getUnit_native(pointer);
+    }
+
+    public Player getPlayer() {
+        return getPlayer_native(pointer);
+    }
+
+    public boolean isWinner() {
+        return isWinner_native(pointer);
+    }
+
+
+    private static Map<Long, Event> instances = new HashMap<Long, Event>();
+
+    private Event(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Event get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Event instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Event(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native Position getPosition_native(long pointer);
+
+    private native String getText_native(long pointer);
+
+    private native Unit getUnit_native(long pointer);
+
+    private native Player getPlayer_native(long pointer);
+
+    private native boolean isWinner_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/EventType/Enum.java b/generated/bwapi4/EventType/Enum.java
new file mode 100644
index 0000000..6173e74
--- /dev/null
+++ b/generated/bwapi4/EventType/Enum.java
@@ -0,0 +1,41 @@
+package bwapi4.EventType;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	MatchStart(0),
+	MatchEnd(1),
+	MatchFrame(2),
+	MenuFrame(3),
+	SendText(4),
+	ReceiveText(5),
+	PlayerLeft(6),
+	NukeDetect(7),
+	UnitDiscover(8),
+	UnitEvade(9),
+	UnitShow(10),
+	UnitHide(11),
+	UnitCreate(12),
+	UnitDestroy(13),
+	UnitMorph(14),
+	UnitRenegade(15),
+	SaveGame(16),
+	UnitComplete(17);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/ExplosionType.java b/generated/bwapi4/ExplosionType.java
new file mode 100644
index 0000000..7fdca74
--- /dev/null
+++ b/generated/bwapi4/ExplosionType.java
@@ -0,0 +1,90 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class ExplosionType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static ExplosionType None;
+
+    public static ExplosionType Normal;
+
+    public static ExplosionType Radial_Splash;
+
+    public static ExplosionType Enemy_Splash;
+
+    public static ExplosionType Lockdown;
+
+    public static ExplosionType Nuclear_Missile;
+
+    public static ExplosionType Parasite;
+
+    public static ExplosionType Broodlings;
+
+    public static ExplosionType EMP_Shockwave;
+
+    public static ExplosionType Irradiate;
+
+    public static ExplosionType Ensnare;
+
+    public static ExplosionType Plague;
+
+    public static ExplosionType Stasis_Field;
+
+    public static ExplosionType Dark_Swarm;
+
+    public static ExplosionType Consume;
+
+    public static ExplosionType Yamato_Gun;
+
+    public static ExplosionType Restoration;
+
+    public static ExplosionType Disruption_Web;
+
+    public static ExplosionType Corrosive_Acid;
+
+    public static ExplosionType Mind_Control;
+
+    public static ExplosionType Feedback;
+
+    public static ExplosionType Optical_Flare;
+
+    public static ExplosionType Maelstrom;
+
+    public static ExplosionType Air_Splash;
+
+    public static ExplosionType Unknown;
+
+
+    private static Map<Long, ExplosionType> instances = new HashMap<Long, ExplosionType>();
+
+    private ExplosionType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static ExplosionType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        ExplosionType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new ExplosionType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Flag/Enum.java b/generated/bwapi4/Flag/Enum.java
new file mode 100644
index 0000000..cdbf3d4
--- /dev/null
+++ b/generated/bwapi4/Flag/Enum.java
@@ -0,0 +1,25 @@
+package bwapi4.Flag;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	CompleteMapInformation(0),
+	UserInput(1);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/Force.java b/generated/bwapi4/Force.java
new file mode 100644
index 0000000..0a46073
--- /dev/null
+++ b/generated/bwapi4/Force.java
@@ -0,0 +1,52 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Force {
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public String getName() {
+        return getName_native(pointer);
+    }
+
+    public List<Player> getPlayers() {
+        return getPlayers_native(pointer);
+    }
+
+
+    private static Map<Long, Force> instances = new HashMap<Long, Force>();
+
+    private Force(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Force get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Force instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Force(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native String getName_native(long pointer);
+
+    private native List<Player> getPlayers_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Forceset.java b/generated/bwapi4/Forceset.java
new file mode 100644
index 0000000..cb4b362
--- /dev/null
+++ b/generated/bwapi4/Forceset.java
@@ -0,0 +1,40 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Forceset {
+
+    public List<Player> getPlayers() {
+        return getPlayers_native(pointer);
+    }
+
+
+    private static Map<Long, Forceset> instances = new HashMap<Long, Forceset>();
+
+    private Forceset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Forceset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Forceset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Forceset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native List<Player> getPlayers_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Game.java b/generated/bwapi4/Game.java
new file mode 100644
index 0000000..196543b
--- /dev/null
+++ b/generated/bwapi4/Game.java
@@ -0,0 +1,1330 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Game {
+
+    public List<Force> getForces() {
+        return getForces_native(pointer);
+    }
+
+    public List<Player> getPlayers() {
+        return getPlayers_native(pointer);
+    }
+
+    public List<Unit> getAllUnits() {
+        return getAllUnits_native(pointer);
+    }
+
+    public List<Unit> getMinerals() {
+        return getMinerals_native(pointer);
+    }
+
+    public List<Unit> getGeysers() {
+        return getGeysers_native(pointer);
+    }
+
+    public List<Unit> getNeutralUnits() {
+        return getNeutralUnits_native(pointer);
+    }
+
+    public List<Unit> getStaticMinerals() {
+        return getStaticMinerals_native(pointer);
+    }
+
+    public List<Unit> getStaticGeysers() {
+        return getStaticGeysers_native(pointer);
+    }
+
+    public List<Unit> getStaticNeutralUnits() {
+        return getStaticNeutralUnits_native(pointer);
+    }
+
+    public List<Bullet> getBullets() {
+        return getBullets_native(pointer);
+    }
+
+    public Force getForce(int forceID) {
+        return getForce_native(pointer, forceID);
+    }
+
+    public Player getPlayer(int playerID) {
+        return getPlayer_native(pointer, playerID);
+    }
+
+    public Unit getUnit(int unitID) {
+        return getUnit_native(pointer, unitID);
+    }
+
+    public Unit indexToUnit(int unitIndex) {
+        return indexToUnit_native(pointer, unitIndex);
+    }
+
+    public Region getRegion(int regionID) {
+        return getRegion_native(pointer, regionID);
+    }
+
+    public GameType getGameType() {
+        return getGameType_native(pointer);
+    }
+
+    public int getLatency() {
+        return getLatency_native(pointer);
+    }
+
+    public int getFrameCount() {
+        return getFrameCount_native(pointer);
+    }
+
+    public int getReplayFrameCount() {
+        return getReplayFrameCount_native(pointer);
+    }
+
+    public int getFPS() {
+        return getFPS_native(pointer);
+    }
+
+    public double getAverageFPS() {
+        return getAverageFPS_native(pointer);
+    }
+
+    public Position getMousePosition() {
+        return getMousePosition_native(pointer);
+    }
+
+    public boolean getMouseState(MouseButton button) {
+        return getMouseState_native(pointer, button);
+    }
+
+    public boolean getKeyState(Key key) {
+        return getKeyState_native(pointer, key);
+    }
+
+    public Position getScreenPosition() {
+        return getScreenPosition_native(pointer);
+    }
+
+    public void setScreenPosition(int x, int y) {
+        setScreenPosition_native(pointer, x, y);
+    }
+
+    public void setScreenPosition(Position p) {
+        setScreenPosition_native(pointer, p);
+    }
+
+    public void pingMinimap(int x, int y) {
+        pingMinimap_native(pointer, x, y);
+    }
+
+    public void pingMinimap(Position p) {
+        pingMinimap_native(pointer, p);
+    }
+
+    public boolean isFlagEnabled(int flag) {
+        return isFlagEnabled_native(pointer, flag);
+    }
+
+    public void enableFlag(int flag) {
+        enableFlag_native(pointer, flag);
+    }
+
+    public Error getLastError() {
+        return getLastError_native(pointer);
+    }
+
+    public boolean setLastError() {
+        return setLastError_native(pointer);
+    }
+
+    public boolean setLastError(Error e) {
+        return setLastError_native(pointer, e);
+    }
+
+    public int mapWidth() {
+        return mapWidth_native(pointer);
+    }
+
+    public int mapHeight() {
+        return mapHeight_native(pointer);
+    }
+
+    public String mapFileName() {
+        return mapFileName_native(pointer);
+    }
+
+    public String mapPathName() {
+        return mapPathName_native(pointer);
+    }
+
+    public String mapName() {
+        return mapName_native(pointer);
+    }
+
+    public String mapHash() {
+        return mapHash_native(pointer);
+    }
+
+    public boolean isWalkable(int walkX, int walkY) {
+        return isWalkable_native(pointer, walkX, walkY);
+    }
+
+    public boolean isWalkable(WalkPosition position) {
+        return isWalkable_native(pointer, position);
+    }
+
+    public int getGroundHeight(int tileX, int tileY) {
+        return getGroundHeight_native(pointer, tileX, tileY);
+    }
+
+    public int getGroundHeight(TilePosition position) {
+        return getGroundHeight_native(pointer, position);
+    }
+
+    public boolean isBuildable(int tileX, int tileY) {
+        return isBuildable_native(pointer, tileX, tileY);
+    }
+
+    public boolean isBuildable(int tileX, int tileY, boolean includeBuildings) {
+        return isBuildable_native(pointer, tileX, tileY, includeBuildings);
+    }
+
+    public boolean isBuildable(TilePosition position) {
+        return isBuildable_native(pointer, position);
+    }
+
+    public boolean isBuildable(TilePosition position, boolean includeBuildings) {
+        return isBuildable_native(pointer, position, includeBuildings);
+    }
+
+    public boolean isVisible(int tileX, int tileY) {
+        return isVisible_native(pointer, tileX, tileY);
+    }
+
+    public boolean isVisible(TilePosition position) {
+        return isVisible_native(pointer, position);
+    }
+
+    public boolean isExplored(int tileX, int tileY) {
+        return isExplored_native(pointer, tileX, tileY);
+    }
+
+    public boolean isExplored(TilePosition position) {
+        return isExplored_native(pointer, position);
+    }
+
+    public boolean hasCreep(int tileX, int tileY) {
+        return hasCreep_native(pointer, tileX, tileY);
+    }
+
+    public boolean hasCreep(TilePosition position) {
+        return hasCreep_native(pointer, position);
+    }
+
+    public boolean hasPowerPrecise(int x, int y) {
+        return hasPowerPrecise_native(pointer, x, y);
+    }
+
+    public boolean hasPowerPrecise(int x, int y, UnitType unitType) {
+        return hasPowerPrecise_native(pointer, x, y, unitType);
+    }
+
+    public boolean hasPowerPrecise(Position position) {
+        return hasPowerPrecise_native(pointer, position);
+    }
+
+    public boolean hasPowerPrecise(Position position, UnitType unitType) {
+        return hasPowerPrecise_native(pointer, position, unitType);
+    }
+
+    public boolean hasPower(int tileX, int tileY) {
+        return hasPower_native(pointer, tileX, tileY);
+    }
+
+    public boolean hasPower(int tileX, int tileY, UnitType unitType) {
+        return hasPower_native(pointer, tileX, tileY, unitType);
+    }
+
+    public boolean hasPower(TilePosition position) {
+        return hasPower_native(pointer, position);
+    }
+
+    public boolean hasPower(TilePosition position, UnitType unitType) {
+        return hasPower_native(pointer, position, unitType);
+    }
+
+    public boolean hasPower(int tileX, int tileY, int tileWidth, int tileHeight) {
+        return hasPower_native(pointer, tileX, tileY, tileWidth, tileHeight);
+    }
+
+    public boolean hasPower(int tileX, int tileY, int tileWidth, int tileHeight, UnitType unitType) {
+        return hasPower_native(pointer, tileX, tileY, tileWidth, tileHeight, unitType);
+    }
+
+    public boolean hasPower(TilePosition position, int tileWidth, int tileHeight) {
+        return hasPower_native(pointer, position, tileWidth, tileHeight);
+    }
+
+    public boolean hasPower(TilePosition position, int tileWidth, int tileHeight, UnitType unitType) {
+        return hasPower_native(pointer, position, tileWidth, tileHeight, unitType);
+    }
+
+    public boolean canBuildHere(TilePosition position, UnitType type, Unit builder) {
+        return canBuildHere_native(pointer, position, type, builder);
+    }
+
+    public boolean canBuildHere(TilePosition position, UnitType type) {
+        return canBuildHere_native(pointer, position, type);
+    }
+
+    public boolean canBuildHere(TilePosition position, UnitType type, Unit builder, boolean checkExplored) {
+        return canBuildHere_native(pointer, position, type, builder, checkExplored);
+    }
+
+    public boolean canMake(UnitType type) {
+        return canMake_native(pointer, type);
+    }
+
+    public boolean canMake(UnitType type, Unit builder) {
+        return canMake_native(pointer, type, builder);
+    }
+
+    public boolean canResearch(TechType type, Unit unit) {
+        return canResearch_native(pointer, type, unit);
+    }
+
+    public boolean canResearch(TechType type) {
+        return canResearch_native(pointer, type);
+    }
+
+    public boolean canResearch(TechType type, Unit unit, boolean checkCanIssueCommandType) {
+        return canResearch_native(pointer, type, unit, checkCanIssueCommandType);
+    }
+
+    public boolean canUpgrade(UpgradeType type, Unit unit) {
+        return canUpgrade_native(pointer, type, unit);
+    }
+
+    public boolean canUpgrade(UpgradeType type) {
+        return canUpgrade_native(pointer, type);
+    }
+
+    public boolean canUpgrade(UpgradeType type, Unit unit, boolean checkCanIssueCommandType) {
+        return canUpgrade_native(pointer, type, unit, checkCanIssueCommandType);
+    }
+
+    public void printf(String cstr_format) {
+        printf_native(pointer, cstr_format);
+    }
+
+    public void sendText(String cstr_format) {
+        sendText_native(pointer, cstr_format);
+    }
+
+    public void sendTextEx(boolean toAllies, String cstr_format) {
+        sendTextEx_native(pointer, toAllies, cstr_format);
+    }
+
+    public boolean isInGame() {
+        return isInGame_native(pointer);
+    }
+
+    public boolean isMultiplayer() {
+        return isMultiplayer_native(pointer);
+    }
+
+    public boolean isBattleNet() {
+        return isBattleNet_native(pointer);
+    }
+
+    public boolean isPaused() {
+        return isPaused_native(pointer);
+    }
+
+    public boolean isReplay() {
+        return isReplay_native(pointer);
+    }
+
+    public void pauseGame() {
+        pauseGame_native(pointer);
+    }
+
+    public void resumeGame() {
+        resumeGame_native(pointer);
+    }
+
+    public void leaveGame() {
+        leaveGame_native(pointer);
+    }
+
+    public void restartGame() {
+        restartGame_native(pointer);
+    }
+
+    public void setLocalSpeed(int speed) {
+        setLocalSpeed_native(pointer, speed);
+    }
+
+    public boolean issueCommand(List<Unit> units, UnitCommand command) {
+        return issueCommand_native(pointer, units, command);
+    }
+
+    public List<Unit> getSelectedUnits() {
+        return getSelectedUnits_native(pointer);
+    }
+
+    public Player self() {
+        return self_native(pointer);
+    }
+
+    public Player enemy() {
+        return enemy_native(pointer);
+    }
+
+    public Player neutral() {
+        return neutral_native(pointer);
+    }
+
+    public List<Player> allies() {
+        return allies_native(pointer);
+    }
+
+    public List<Player> enemies() {
+        return enemies_native(pointer);
+    }
+
+    public List<Player> observers() {
+        return observers_native(pointer);
+    }
+
+    public void setTextSize() {
+        setTextSize_native(pointer);
+    }
+
+    public void setTextSize(bwapi4.Text.Size.Enum size) {
+        setTextSize_native(pointer, size);
+    }
+
+    public void drawText(bwapi4.CoordinateType.Enum ctype, int x, int y, String cstr_format) {
+        drawText_native(pointer, ctype, x, y, cstr_format);
+    }
+
+    public void drawTextMap(int x, int y, String cstr_format) {
+        drawTextMap_native(pointer, x, y, cstr_format);
+    }
+
+    public void drawTextMap(Position p, String cstr_format) {
+        drawTextMap_native(pointer, p, cstr_format);
+    }
+
+    public void drawTextMouse(int x, int y, String cstr_format) {
+        drawTextMouse_native(pointer, x, y, cstr_format);
+    }
+
+    public void drawTextMouse(Position p, String cstr_format) {
+        drawTextMouse_native(pointer, p, cstr_format);
+    }
+
+    public void drawTextScreen(int x, int y, String cstr_format) {
+        drawTextScreen_native(pointer, x, y, cstr_format);
+    }
+
+    public void drawTextScreen(Position p, String cstr_format) {
+        drawTextScreen_native(pointer, p, cstr_format);
+    }
+
+    public void drawBox(bwapi4.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color) {
+        drawBox_native(pointer, ctype, left, top, right, bottom, color);
+    }
+
+    public void drawBox(bwapi4.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBox_native(pointer, ctype, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxMap(int left, int top, int right, int bottom, Color color) {
+        drawBoxMap_native(pointer, left, top, right, bottom, color);
+    }
+
+    public void drawBoxMap(int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBoxMap_native(pointer, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxMap(Position leftTop, Position rightBottom, Color color) {
+        drawBoxMap_native(pointer, leftTop, rightBottom, color);
+    }
+
+    public void drawBoxMap(Position leftTop, Position rightBottom, Color color, boolean isSolid) {
+        drawBoxMap_native(pointer, leftTop, rightBottom, color, isSolid);
+    }
+
+    public void drawBoxMouse(int left, int top, int right, int bottom, Color color) {
+        drawBoxMouse_native(pointer, left, top, right, bottom, color);
+    }
+
+    public void drawBoxMouse(int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBoxMouse_native(pointer, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxMouse(Position leftTop, Position rightBottom, Color color) {
+        drawBoxMouse_native(pointer, leftTop, rightBottom, color);
+    }
+
+    public void drawBoxMouse(Position leftTop, Position rightBottom, Color color, boolean isSolid) {
+        drawBoxMouse_native(pointer, leftTop, rightBottom, color, isSolid);
+    }
+
+    public void drawBoxScreen(int left, int top, int right, int bottom, Color color) {
+        drawBoxScreen_native(pointer, left, top, right, bottom, color);
+    }
+
+    public void drawBoxScreen(int left, int top, int right, int bottom, Color color, boolean isSolid) {
+        drawBoxScreen_native(pointer, left, top, right, bottom, color, isSolid);
+    }
+
+    public void drawBoxScreen(Position leftTop, Position rightBottom, Color color) {
+        drawBoxScreen_native(pointer, leftTop, rightBottom, color);
+    }
+
+    public void drawBoxScreen(Position leftTop, Position rightBottom, Color color, boolean isSolid) {
+        drawBoxScreen_native(pointer, leftTop, rightBottom, color, isSolid);
+    }
+
+    public void drawTriangle(bwapi4.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangle_native(pointer, ctype, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangle(bwapi4.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangle_native(pointer, ctype, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleMap(int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangleMap_native(pointer, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangleMap(int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangleMap_native(pointer, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleMap(Position a, Position b, Position c, Color color) {
+        drawTriangleMap_native(pointer, a, b, c, color);
+    }
+
+    public void drawTriangleMap(Position a, Position b, Position c, Color color, boolean isSolid) {
+        drawTriangleMap_native(pointer, a, b, c, color, isSolid);
+    }
+
+    public void drawTriangleMouse(int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangleMouse_native(pointer, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangleMouse(int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangleMouse_native(pointer, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleMouse(Position a, Position b, Position c, Color color) {
+        drawTriangleMouse_native(pointer, a, b, c, color);
+    }
+
+    public void drawTriangleMouse(Position a, Position b, Position c, Color color, boolean isSolid) {
+        drawTriangleMouse_native(pointer, a, b, c, color, isSolid);
+    }
+
+    public void drawTriangleScreen(int ax, int ay, int bx, int by, int cx, int cy, Color color) {
+        drawTriangleScreen_native(pointer, ax, ay, bx, by, cx, cy, color);
+    }
+
+    public void drawTriangleScreen(int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid) {
+        drawTriangleScreen_native(pointer, ax, ay, bx, by, cx, cy, color, isSolid);
+    }
+
+    public void drawTriangleScreen(Position a, Position b, Position c, Color color) {
+        drawTriangleScreen_native(pointer, a, b, c, color);
+    }
+
+    public void drawTriangleScreen(Position a, Position b, Position c, Color color, boolean isSolid) {
+        drawTriangleScreen_native(pointer, a, b, c, color, isSolid);
+    }
+
+    public void drawCircle(bwapi4.CoordinateType.Enum ctype, int x, int y, int radius, Color color) {
+        drawCircle_native(pointer, ctype, x, y, radius, color);
+    }
+
+    public void drawCircle(bwapi4.CoordinateType.Enum ctype, int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircle_native(pointer, ctype, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleMap(int x, int y, int radius, Color color) {
+        drawCircleMap_native(pointer, x, y, radius, color);
+    }
+
+    public void drawCircleMap(int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircleMap_native(pointer, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleMap(Position p, int radius, Color color) {
+        drawCircleMap_native(pointer, p, radius, color);
+    }
+
+    public void drawCircleMap(Position p, int radius, Color color, boolean isSolid) {
+        drawCircleMap_native(pointer, p, radius, color, isSolid);
+    }
+
+    public void drawCircleMouse(int x, int y, int radius, Color color) {
+        drawCircleMouse_native(pointer, x, y, radius, color);
+    }
+
+    public void drawCircleMouse(int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircleMouse_native(pointer, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleMouse(Position p, int radius, Color color) {
+        drawCircleMouse_native(pointer, p, radius, color);
+    }
+
+    public void drawCircleMouse(Position p, int radius, Color color, boolean isSolid) {
+        drawCircleMouse_native(pointer, p, radius, color, isSolid);
+    }
+
+    public void drawCircleScreen(int x, int y, int radius, Color color) {
+        drawCircleScreen_native(pointer, x, y, radius, color);
+    }
+
+    public void drawCircleScreen(int x, int y, int radius, Color color, boolean isSolid) {
+        drawCircleScreen_native(pointer, x, y, radius, color, isSolid);
+    }
+
+    public void drawCircleScreen(Position p, int radius, Color color) {
+        drawCircleScreen_native(pointer, p, radius, color);
+    }
+
+    public void drawCircleScreen(Position p, int radius, Color color, boolean isSolid) {
+        drawCircleScreen_native(pointer, p, radius, color, isSolid);
+    }
+
+    public void drawEllipse(bwapi4.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color) {
+        drawEllipse_native(pointer, ctype, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipse(bwapi4.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipse_native(pointer, ctype, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMap(int x, int y, int xrad, int yrad, Color color) {
+        drawEllipseMap_native(pointer, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipseMap(int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMap_native(pointer, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMap(Position p, int xrad, int yrad, Color color) {
+        drawEllipseMap_native(pointer, p, xrad, yrad, color);
+    }
+
+    public void drawEllipseMap(Position p, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMap_native(pointer, p, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMouse(int x, int y, int xrad, int yrad, Color color) {
+        drawEllipseMouse_native(pointer, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipseMouse(int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMouse_native(pointer, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseMouse(Position p, int xrad, int yrad, Color color) {
+        drawEllipseMouse_native(pointer, p, xrad, yrad, color);
+    }
+
+    public void drawEllipseMouse(Position p, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseMouse_native(pointer, p, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseScreen(int x, int y, int xrad, int yrad, Color color) {
+        drawEllipseScreen_native(pointer, x, y, xrad, yrad, color);
+    }
+
+    public void drawEllipseScreen(int x, int y, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseScreen_native(pointer, x, y, xrad, yrad, color, isSolid);
+    }
+
+    public void drawEllipseScreen(Position p, int xrad, int yrad, Color color) {
+        drawEllipseScreen_native(pointer, p, xrad, yrad, color);
+    }
+
+    public void drawEllipseScreen(Position p, int xrad, int yrad, Color color, boolean isSolid) {
+        drawEllipseScreen_native(pointer, p, xrad, yrad, color, isSolid);
+    }
+
+    public void drawDot(bwapi4.CoordinateType.Enum ctype, int x, int y, Color color) {
+        drawDot_native(pointer, ctype, x, y, color);
+    }
+
+    public void drawDotMap(int x, int y, Color color) {
+        drawDotMap_native(pointer, x, y, color);
+    }
+
+    public void drawDotMap(Position p, Color color) {
+        drawDotMap_native(pointer, p, color);
+    }
+
+    public void drawDotMouse(int x, int y, Color color) {
+        drawDotMouse_native(pointer, x, y, color);
+    }
+
+    public void drawDotMouse(Position p, Color color) {
+        drawDotMouse_native(pointer, p, color);
+    }
+
+    public void drawDotScreen(int x, int y, Color color) {
+        drawDotScreen_native(pointer, x, y, color);
+    }
+
+    public void drawDotScreen(Position p, Color color) {
+        drawDotScreen_native(pointer, p, color);
+    }
+
+    public void drawLine(bwapi4.CoordinateType.Enum ctype, int x1, int y1, int x2, int y2, Color color) {
+        drawLine_native(pointer, ctype, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineMap(int x1, int y1, int x2, int y2, Color color) {
+        drawLineMap_native(pointer, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineMap(Position a, Position b, Color color) {
+        drawLineMap_native(pointer, a, b, color);
+    }
+
+    public void drawLineMouse(int x1, int y1, int x2, int y2, Color color) {
+        drawLineMouse_native(pointer, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineMouse(Position a, Position b, Color color) {
+        drawLineMouse_native(pointer, a, b, color);
+    }
+
+    public void drawLineScreen(int x1, int y1, int x2, int y2, Color color) {
+        drawLineScreen_native(pointer, x1, y1, x2, y2, color);
+    }
+
+    public void drawLineScreen(Position a, Position b, Color color) {
+        drawLineScreen_native(pointer, a, b, color);
+    }
+
+    public int getLatencyFrames() {
+        return getLatencyFrames_native(pointer);
+    }
+
+    public int getLatencyTime() {
+        return getLatencyTime_native(pointer);
+    }
+
+    public int getRemainingLatencyFrames() {
+        return getRemainingLatencyFrames_native(pointer);
+    }
+
+    public int getRemainingLatencyTime() {
+        return getRemainingLatencyTime_native(pointer);
+    }
+
+    public int getRevision() {
+        return getRevision_native(pointer);
+    }
+
+    public boolean isDebug() {
+        return isDebug_native(pointer);
+    }
+
+    public boolean isLatComEnabled() {
+        return isLatComEnabled_native(pointer);
+    }
+
+    public void setLatCom(boolean isEnabled) {
+        setLatCom_native(pointer, isEnabled);
+    }
+
+    public boolean isGUIEnabled() {
+        return isGUIEnabled_native(pointer);
+    }
+
+    public void setGUI(boolean enabled) {
+        setGUI_native(pointer, enabled);
+    }
+
+    public int getInstanceNumber() {
+        return getInstanceNumber_native(pointer);
+    }
+
+    public int getAPM() {
+        return getAPM_native(pointer);
+    }
+
+    public int getAPM(boolean includeSelects) {
+        return getAPM_native(pointer, includeSelects);
+    }
+
+    public boolean setMap(String cstr_mapFileName) {
+        return setMap_native(pointer, cstr_mapFileName);
+    }
+
+    public void setFrameSkip(int frameSkip) {
+        setFrameSkip_native(pointer, frameSkip);
+    }
+
+    public boolean hasPath(Position source, Position destination) {
+        return hasPath_native(pointer, source, destination);
+    }
+
+    public boolean setAlliance(Player player, boolean allied) {
+        return setAlliance_native(pointer, player, allied);
+    }
+
+    public boolean setAlliance(Player player) {
+        return setAlliance_native(pointer, player);
+    }
+
+    public boolean setAlliance(Player player, boolean allied, boolean alliedVictory) {
+        return setAlliance_native(pointer, player, allied, alliedVictory);
+    }
+
+    public boolean setVision(Player player) {
+        return setVision_native(pointer, player);
+    }
+
+    public boolean setVision(Player player, boolean enabled) {
+        return setVision_native(pointer, player, enabled);
+    }
+
+    public int elapsedTime() {
+        return elapsedTime_native(pointer);
+    }
+
+    public void setCommandOptimizationLevel(int level) {
+        setCommandOptimizationLevel_native(pointer, level);
+    }
+
+    public int countdownTimer() {
+        return countdownTimer_native(pointer);
+    }
+
+    public List<Region> getAllRegions() {
+        return getAllRegions_native(pointer);
+    }
+
+    public Region getRegionAt(int x, int y) {
+        return getRegionAt_native(pointer, x, y);
+    }
+
+    public Region getRegionAt(Position position) {
+        return getRegionAt_native(pointer, position);
+    }
+
+    public int getLastEventTime() {
+        return getLastEventTime_native(pointer);
+    }
+
+    public boolean setRevealAll() {
+        return setRevealAll_native(pointer);
+    }
+
+    public boolean setRevealAll(boolean reveal) {
+        return setRevealAll_native(pointer, reveal);
+    }
+
+    public TilePosition getBuildLocation(UnitType type, TilePosition desiredPosition, int maxRange) {
+        return getBuildLocation_native(pointer, type, desiredPosition, maxRange);
+    }
+
+    public TilePosition getBuildLocation(UnitType type, TilePosition desiredPosition) {
+        return getBuildLocation_native(pointer, type, desiredPosition);
+    }
+
+    public TilePosition getBuildLocation(UnitType type, TilePosition desiredPosition, int maxRange, boolean creep) {
+        return getBuildLocation_native(pointer, type, desiredPosition, maxRange, creep);
+    }
+
+    public int getDamageFrom(UnitType fromType, UnitType toType, Player fromPlayer) {
+        return getDamageFrom_native(pointer, fromType, toType, fromPlayer);
+    }
+
+    public int getDamageFrom(UnitType fromType, UnitType toType) {
+        return getDamageFrom_native(pointer, fromType, toType);
+    }
+
+    public int getDamageFrom(UnitType fromType, UnitType toType, Player fromPlayer, Player toPlayer) {
+        return getDamageFrom_native(pointer, fromType, toType, fromPlayer, toPlayer);
+    }
+
+    public int getDamageTo(UnitType toType, UnitType fromType, Player toPlayer) {
+        return getDamageTo_native(pointer, toType, fromType, toPlayer);
+    }
+
+    public int getDamageTo(UnitType toType, UnitType fromType) {
+        return getDamageTo_native(pointer, toType, fromType);
+    }
+
+    public int getDamageTo(UnitType toType, UnitType fromType, Player toPlayer, Player fromPlayer) {
+        return getDamageTo_native(pointer, toType, fromType, toPlayer, fromPlayer);
+    }
+
+
+    private static Map<Long, Game> instances = new HashMap<Long, Game>();
+
+    private Game(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Game get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Game instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Game(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native List<Force> getForces_native(long pointer);
+
+    private native List<Player> getPlayers_native(long pointer);
+
+    private native List<Unit> getAllUnits_native(long pointer);
+
+    private native List<Unit> getMinerals_native(long pointer);
+
+    private native List<Unit> getGeysers_native(long pointer);
+
+    private native List<Unit> getNeutralUnits_native(long pointer);
+
+    private native List<Unit> getStaticMinerals_native(long pointer);
+
+    private native List<Unit> getStaticGeysers_native(long pointer);
+
+    private native List<Unit> getStaticNeutralUnits_native(long pointer);
+
+    private native List<Bullet> getBullets_native(long pointer);
+
+    private native Force getForce_native(long pointer, int forceID);
+
+    private native Player getPlayer_native(long pointer, int playerID);
+
+    private native Unit getUnit_native(long pointer, int unitID);
+
+    private native Unit indexToUnit_native(long pointer, int unitIndex);
+
+    private native Region getRegion_native(long pointer, int regionID);
+
+    private native GameType getGameType_native(long pointer);
+
+    private native int getLatency_native(long pointer);
+
+    private native int getFrameCount_native(long pointer);
+
+    private native int getReplayFrameCount_native(long pointer);
+
+    private native int getFPS_native(long pointer);
+
+    private native double getAverageFPS_native(long pointer);
+
+    private native Position getMousePosition_native(long pointer);
+
+    private native boolean getMouseState_native(long pointer, MouseButton button);
+
+    private native boolean getKeyState_native(long pointer, Key key);
+
+    private native Position getScreenPosition_native(long pointer);
+
+    private native void setScreenPosition_native(long pointer, int x, int y);
+
+    private native void setScreenPosition_native(long pointer, Position p);
+
+    private native void pingMinimap_native(long pointer, int x, int y);
+
+    private native void pingMinimap_native(long pointer, Position p);
+
+    private native boolean isFlagEnabled_native(long pointer, int flag);
+
+    private native void enableFlag_native(long pointer, int flag);
+
+    private native Error getLastError_native(long pointer);
+
+    private native boolean setLastError_native(long pointer);
+
+    private native boolean setLastError_native(long pointer, Error e);
+
+    private native int mapWidth_native(long pointer);
+
+    private native int mapHeight_native(long pointer);
+
+    private native String mapFileName_native(long pointer);
+
+    private native String mapPathName_native(long pointer);
+
+    private native String mapName_native(long pointer);
+
+    private native String mapHash_native(long pointer);
+
+    private native boolean isWalkable_native(long pointer, int walkX, int walkY);
+
+    private native boolean isWalkable_native(long pointer, WalkPosition position);
+
+    private native int getGroundHeight_native(long pointer, int tileX, int tileY);
+
+    private native int getGroundHeight_native(long pointer, TilePosition position);
+
+    private native boolean isBuildable_native(long pointer, int tileX, int tileY);
+
+    private native boolean isBuildable_native(long pointer, int tileX, int tileY, boolean includeBuildings);
+
+    private native boolean isBuildable_native(long pointer, TilePosition position);
+
+    private native boolean isBuildable_native(long pointer, TilePosition position, boolean includeBuildings);
+
+    private native boolean isVisible_native(long pointer, int tileX, int tileY);
+
+    private native boolean isVisible_native(long pointer, TilePosition position);
+
+    private native boolean isExplored_native(long pointer, int tileX, int tileY);
+
+    private native boolean isExplored_native(long pointer, TilePosition position);
+
+    private native boolean hasCreep_native(long pointer, int tileX, int tileY);
+
+    private native boolean hasCreep_native(long pointer, TilePosition position);
+
+    private native boolean hasPowerPrecise_native(long pointer, int x, int y);
+
+    private native boolean hasPowerPrecise_native(long pointer, int x, int y, UnitType unitType);
+
+    private native boolean hasPowerPrecise_native(long pointer, Position position);
+
+    private native boolean hasPowerPrecise_native(long pointer, Position position, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, TilePosition position);
+
+    private native boolean hasPower_native(long pointer, TilePosition position, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY, int tileWidth, int tileHeight);
+
+    private native boolean hasPower_native(long pointer, int tileX, int tileY, int tileWidth, int tileHeight, UnitType unitType);
+
+    private native boolean hasPower_native(long pointer, TilePosition position, int tileWidth, int tileHeight);
+
+    private native boolean hasPower_native(long pointer, TilePosition position, int tileWidth, int tileHeight, UnitType unitType);
+
+    private native boolean canBuildHere_native(long pointer, TilePosition position, UnitType type, Unit builder);
+
+    private native boolean canBuildHere_native(long pointer, TilePosition position, UnitType type);
+
+    private native boolean canBuildHere_native(long pointer, TilePosition position, UnitType type, Unit builder, boolean checkExplored);
+
+    private native boolean canMake_native(long pointer, UnitType type);
+
+    private native boolean canMake_native(long pointer, UnitType type, Unit builder);
+
+    private native boolean canResearch_native(long pointer, TechType type, Unit unit);
+
+    private native boolean canResearch_native(long pointer, TechType type);
+
+    private native boolean canResearch_native(long pointer, TechType type, Unit unit, boolean checkCanIssueCommandType);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type, Unit unit);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type, Unit unit, boolean checkCanIssueCommandType);
+
+    private native void printf_native(long pointer, String cstr_format);
+
+    private native void sendText_native(long pointer, String cstr_format);
+
+    private native void sendTextEx_native(long pointer, boolean toAllies, String cstr_format);
+
+    private native boolean isInGame_native(long pointer);
+
+    private native boolean isMultiplayer_native(long pointer);
+
+    private native boolean isBattleNet_native(long pointer);
+
+    private native boolean isPaused_native(long pointer);
+
+    private native boolean isReplay_native(long pointer);
+
+    private native void pauseGame_native(long pointer);
+
+    private native void resumeGame_native(long pointer);
+
+    private native void leaveGame_native(long pointer);
+
+    private native void restartGame_native(long pointer);
+
+    private native void setLocalSpeed_native(long pointer, int speed);
+
+    private native boolean issueCommand_native(long pointer, List<Unit> units, UnitCommand command);
+
+    private native List<Unit> getSelectedUnits_native(long pointer);
+
+    private native Player self_native(long pointer);
+
+    private native Player enemy_native(long pointer);
+
+    private native Player neutral_native(long pointer);
+
+    private native List<Player> allies_native(long pointer);
+
+    private native List<Player> enemies_native(long pointer);
+
+    private native List<Player> observers_native(long pointer);
+
+    private native void setTextSize_native(long pointer);
+
+    private native void setTextSize_native(long pointer, bwapi4.Text.Size.Enum size);
+
+    private native void drawText_native(long pointer, bwapi4.CoordinateType.Enum ctype, int x, int y, String cstr_format);
+
+    private native void drawTextMap_native(long pointer, int x, int y, String cstr_format);
+
+    private native void drawTextMap_native(long pointer, Position p, String cstr_format);
+
+    private native void drawTextMouse_native(long pointer, int x, int y, String cstr_format);
+
+    private native void drawTextMouse_native(long pointer, Position p, String cstr_format);
+
+    private native void drawTextScreen_native(long pointer, int x, int y, String cstr_format);
+
+    private native void drawTextScreen_native(long pointer, Position p, String cstr_format);
+
+    private native void drawBox_native(long pointer, bwapi4.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBox_native(long pointer, bwapi4.CoordinateType.Enum ctype, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxMap_native(long pointer, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBoxMap_native(long pointer, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxMap_native(long pointer, Position leftTop, Position rightBottom, Color color);
+
+    private native void drawBoxMap_native(long pointer, Position leftTop, Position rightBottom, Color color, boolean isSolid);
+
+    private native void drawBoxMouse_native(long pointer, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBoxMouse_native(long pointer, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxMouse_native(long pointer, Position leftTop, Position rightBottom, Color color);
+
+    private native void drawBoxMouse_native(long pointer, Position leftTop, Position rightBottom, Color color, boolean isSolid);
+
+    private native void drawBoxScreen_native(long pointer, int left, int top, int right, int bottom, Color color);
+
+    private native void drawBoxScreen_native(long pointer, int left, int top, int right, int bottom, Color color, boolean isSolid);
+
+    private native void drawBoxScreen_native(long pointer, Position leftTop, Position rightBottom, Color color);
+
+    private native void drawBoxScreen_native(long pointer, Position leftTop, Position rightBottom, Color color, boolean isSolid);
+
+    private native void drawTriangle_native(long pointer, bwapi4.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangle_native(long pointer, bwapi4.CoordinateType.Enum ctype, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleMap_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangleMap_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleMap_native(long pointer, Position a, Position b, Position c, Color color);
+
+    private native void drawTriangleMap_native(long pointer, Position a, Position b, Position c, Color color, boolean isSolid);
+
+    private native void drawTriangleMouse_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangleMouse_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleMouse_native(long pointer, Position a, Position b, Position c, Color color);
+
+    private native void drawTriangleMouse_native(long pointer, Position a, Position b, Position c, Color color, boolean isSolid);
+
+    private native void drawTriangleScreen_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color);
+
+    private native void drawTriangleScreen_native(long pointer, int ax, int ay, int bx, int by, int cx, int cy, Color color, boolean isSolid);
+
+    private native void drawTriangleScreen_native(long pointer, Position a, Position b, Position c, Color color);
+
+    private native void drawTriangleScreen_native(long pointer, Position a, Position b, Position c, Color color, boolean isSolid);
+
+    private native void drawCircle_native(long pointer, bwapi4.CoordinateType.Enum ctype, int x, int y, int radius, Color color);
+
+    private native void drawCircle_native(long pointer, bwapi4.CoordinateType.Enum ctype, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMap_native(long pointer, int x, int y, int radius, Color color);
+
+    private native void drawCircleMap_native(long pointer, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMap_native(long pointer, Position p, int radius, Color color);
+
+    private native void drawCircleMap_native(long pointer, Position p, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMouse_native(long pointer, int x, int y, int radius, Color color);
+
+    private native void drawCircleMouse_native(long pointer, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleMouse_native(long pointer, Position p, int radius, Color color);
+
+    private native void drawCircleMouse_native(long pointer, Position p, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleScreen_native(long pointer, int x, int y, int radius, Color color);
+
+    private native void drawCircleScreen_native(long pointer, int x, int y, int radius, Color color, boolean isSolid);
+
+    private native void drawCircleScreen_native(long pointer, Position p, int radius, Color color);
+
+    private native void drawCircleScreen_native(long pointer, Position p, int radius, Color color, boolean isSolid);
+
+    private native void drawEllipse_native(long pointer, bwapi4.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipse_native(long pointer, bwapi4.CoordinateType.Enum ctype, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMap_native(long pointer, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMap_native(long pointer, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMap_native(long pointer, Position p, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMap_native(long pointer, Position p, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMouse_native(long pointer, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMouse_native(long pointer, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseMouse_native(long pointer, Position p, int xrad, int yrad, Color color);
+
+    private native void drawEllipseMouse_native(long pointer, Position p, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseScreen_native(long pointer, int x, int y, int xrad, int yrad, Color color);
+
+    private native void drawEllipseScreen_native(long pointer, int x, int y, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawEllipseScreen_native(long pointer, Position p, int xrad, int yrad, Color color);
+
+    private native void drawEllipseScreen_native(long pointer, Position p, int xrad, int yrad, Color color, boolean isSolid);
+
+    private native void drawDot_native(long pointer, bwapi4.CoordinateType.Enum ctype, int x, int y, Color color);
+
+    private native void drawDotMap_native(long pointer, int x, int y, Color color);
+
+    private native void drawDotMap_native(long pointer, Position p, Color color);
+
+    private native void drawDotMouse_native(long pointer, int x, int y, Color color);
+
+    private native void drawDotMouse_native(long pointer, Position p, Color color);
+
+    private native void drawDotScreen_native(long pointer, int x, int y, Color color);
+
+    private native void drawDotScreen_native(long pointer, Position p, Color color);
+
+    private native void drawLine_native(long pointer, bwapi4.CoordinateType.Enum ctype, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineMap_native(long pointer, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineMap_native(long pointer, Position a, Position b, Color color);
+
+    private native void drawLineMouse_native(long pointer, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineMouse_native(long pointer, Position a, Position b, Color color);
+
+    private native void drawLineScreen_native(long pointer, int x1, int y1, int x2, int y2, Color color);
+
+    private native void drawLineScreen_native(long pointer, Position a, Position b, Color color);
+
+    private native int getLatencyFrames_native(long pointer);
+
+    private native int getLatencyTime_native(long pointer);
+
+    private native int getRemainingLatencyFrames_native(long pointer);
+
+    private native int getRemainingLatencyTime_native(long pointer);
+
+    private native int getRevision_native(long pointer);
+
+    private native boolean isDebug_native(long pointer);
+
+    private native boolean isLatComEnabled_native(long pointer);
+
+    private native void setLatCom_native(long pointer, boolean isEnabled);
+
+    private native boolean isGUIEnabled_native(long pointer);
+
+    private native void setGUI_native(long pointer, boolean enabled);
+
+    private native int getInstanceNumber_native(long pointer);
+
+    private native int getAPM_native(long pointer);
+
+    private native int getAPM_native(long pointer, boolean includeSelects);
+
+    private native boolean setMap_native(long pointer, String cstr_mapFileName);
+
+    private native void setFrameSkip_native(long pointer, int frameSkip);
+
+    private native boolean hasPath_native(long pointer, Position source, Position destination);
+
+    private native boolean setAlliance_native(long pointer, Player player, boolean allied);
+
+    private native boolean setAlliance_native(long pointer, Player player);
+
+    private native boolean setAlliance_native(long pointer, Player player, boolean allied, boolean alliedVictory);
+
+    private native boolean setVision_native(long pointer, Player player);
+
+    private native boolean setVision_native(long pointer, Player player, boolean enabled);
+
+    private native int elapsedTime_native(long pointer);
+
+    private native void setCommandOptimizationLevel_native(long pointer, int level);
+
+    private native int countdownTimer_native(long pointer);
+
+    private native List<Region> getAllRegions_native(long pointer);
+
+    private native Region getRegionAt_native(long pointer, int x, int y);
+
+    private native Region getRegionAt_native(long pointer, Position position);
+
+    private native int getLastEventTime_native(long pointer);
+
+    private native boolean setRevealAll_native(long pointer);
+
+    private native boolean setRevealAll_native(long pointer, boolean reveal);
+
+    private native TilePosition getBuildLocation_native(long pointer, UnitType type, TilePosition desiredPosition, int maxRange);
+
+    private native TilePosition getBuildLocation_native(long pointer, UnitType type, TilePosition desiredPosition);
+
+    private native TilePosition getBuildLocation_native(long pointer, UnitType type, TilePosition desiredPosition, int maxRange, boolean creep);
+
+    private native int getDamageFrom_native(long pointer, UnitType fromType, UnitType toType, Player fromPlayer);
+
+    private native int getDamageFrom_native(long pointer, UnitType fromType, UnitType toType);
+
+    private native int getDamageFrom_native(long pointer, UnitType fromType, UnitType toType, Player fromPlayer, Player toPlayer);
+
+    private native int getDamageTo_native(long pointer, UnitType toType, UnitType fromType, Player toPlayer);
+
+    private native int getDamageTo_native(long pointer, UnitType toType, UnitType fromType);
+
+    private native int getDamageTo_native(long pointer, UnitType toType, UnitType fromType, Player toPlayer, Player fromPlayer);
+
+
+}
diff --git a/generated/bwapi4/GameType.java b/generated/bwapi4/GameType.java
new file mode 100644
index 0000000..5cc745d
--- /dev/null
+++ b/generated/bwapi4/GameType.java
@@ -0,0 +1,70 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class GameType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static GameType Melee;
+
+    public static GameType Free_For_All;
+
+    public static GameType One_on_One;
+
+    public static GameType Capture_The_Flag;
+
+    public static GameType Greed;
+
+    public static GameType Slaughter;
+
+    public static GameType Sudden_Death;
+
+    public static GameType Ladder;
+
+    public static GameType Use_Map_Settings;
+
+    public static GameType Team_Melee;
+
+    public static GameType Team_Free_For_All;
+
+    public static GameType Team_Capture_The_Flag;
+
+    public static GameType Top_vs_Bottom;
+
+    public static GameType None;
+
+    public static GameType Unknown;
+
+
+    private static Map<Long, GameType> instances = new HashMap<Long, GameType>();
+
+    private GameType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static GameType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        GameType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new GameType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Key.java b/generated/bwapi4/Key.java
new file mode 100644
index 0000000..da6c5d3
--- /dev/null
+++ b/generated/bwapi4/Key.java
@@ -0,0 +1,251 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Key {
+
+	K_LBUTTON(1),
+	K_RBUTTON(2),
+	K_CANCEL(3),
+	K_MBUTTON(4),
+	K_XBUTTON1(5),
+	K_XBUTTON2(6),
+	__UNDEFINED_7(7),
+	K_BACK(8),
+	K_TAB(9),
+	__RESERVED_A(10),
+	__RESERVED_B(11),
+	K_CLEAR(12),
+	K_RETURN(13),
+	__UNDEFINED_E(14),
+	__UNDEFINED_F(15),
+	K_SHIFT(16),
+	K_CONTROL(17),
+	K_MENU(18),
+	K_PAUSE(19),
+	K_CAPITAL(20),
+	K_KANA(21),
+	K_UNDEFINED_16(22),
+	K_JUNJA(23),
+	K_FINAL(24),
+	K_KANJI(25),
+	__UNDEFINED_1A(26),
+	K_ESCAPE(27),
+	K_CONVERT(28),
+	K_NONCONVERT(29),
+	K_ACCEPT(30),
+	K_MODECHANGE(31),
+	K_SPACE(32),
+	K_PRIOR(33),
+	K_NEXT(34),
+	K_END(35),
+	K_HOME(36),
+	K_LEFT(37),
+	K_UP(38),
+	K_RIGHT(39),
+	K_DOWN(40),
+	K_SELECT(41),
+	K_PRINT(42),
+	K_EXECUTE(43),
+	K_SNAPSHOT(44),
+	K_INSERT(45),
+	K_DELETE(46),
+	K_HELP(47),
+	K_0(48),
+	K_1(49),
+	K_2(50),
+	K_3(51),
+	K_4(52),
+	K_5(53),
+	K_6(54),
+	K_7(55),
+	K_8(56),
+	K_9(57),
+	__UNDEFINED_3A(58),
+	__UNDEFINED_3B(59),
+	__UNDEFINED_3C(60),
+	__UNDEFINED_3D(61),
+	__UNDEFINED_3E(62),
+	__UNDEFINED_3F(63),
+	__UNDEFINED_40(64),
+	K_A(65),
+	K_B(66),
+	K_C(67),
+	K_D(68),
+	K_E(69),
+	K_F(70),
+	K_G(71),
+	K_H(72),
+	K_I(73),
+	K_J(74),
+	K_K(75),
+	K_L(76),
+	K_M(77),
+	K_N(78),
+	K_O(79),
+	K_P(80),
+	K_Q(81),
+	K_R(82),
+	K_S(83),
+	K_T(84),
+	K_U(85),
+	K_V(86),
+	K_W(87),
+	K_X(88),
+	K_Y(89),
+	K_Z(90),
+	K_LWIN(91),
+	K_RWIN(92),
+	K_APPS(93),
+	__RESERVED_5E(94),
+	K_SLEEP(95),
+	K_NUMPAD0(96),
+	K_NUMPAD1(97),
+	K_NUMPAD2(98),
+	K_NUMPAD3(99),
+	K_NUMPAD4(100),
+	K_NUMPAD5(101),
+	K_NUMPAD6(102),
+	K_NUMPAD7(103),
+	K_NUMPAD8(104),
+	K_NUMPAD9(105),
+	K_MULTIPLY(106),
+	K_ADD(107),
+	K_SEPARATOR(108),
+	K_SUBTRACT(109),
+	K_DECIMAL(110),
+	K_DIVIDE(111),
+	K_F1(112),
+	K_F2(113),
+	K_F3(114),
+	K_F4(115),
+	K_F5(116),
+	K_F6(117),
+	K_F7(118),
+	K_F8(119),
+	K_F9(120),
+	K_F10(121),
+	K_F11(122),
+	K_F12(123),
+	K_F13(124),
+	K_F14(125),
+	K_F15(126),
+	K_F16(127),
+	K_F17(128),
+	K_F18(129),
+	K_F19(130),
+	K_F20(131),
+	K_F21(132),
+	K_F22(133),
+	K_F23(134),
+	K_F24(135),
+	__UNASSIGNED_88(136),
+	__UNASSIGNED_89(137),
+	__UNASSIGNED_8A(138),
+	__UNASSIGNED_8B(139),
+	__UNASSIGNED_8C(140),
+	__UNASSIGNED_8D(141),
+	__UNASSIGNED_8E(142),
+	__UNASSIGNED_8F(143),
+	K_NUMLOCK(144),
+	K_SCROLL(145),
+	K_OEM_NEC_EQUAL(146),
+	K_OEM_FJ_JISHO(147),
+	K_OEM_FJ_MASSHOU(148),
+	K_OEM_FJ_TOUROKU(149),
+	K_OEM_FJ_LOYA(150),
+	__UNASSIGNED_97(151),
+	__UNASSIGNED_98(152),
+	__UNASSIGNED_99(153),
+	__UNASSIGNED_9A(154),
+	__UNASSIGNED_9B(155),
+	__UNASSIGNED_9C(156),
+	__UNASSIGNED_9D(157),
+	__UNASSIGNED_9E(158),
+	__UNASSIGNED_9F(159),
+	K_LSHIFT(160),
+	K_RSHIFT(161),
+	K_LCONTROL(162),
+	K_RCONTROL(163),
+	K_LMENU(164),
+	K_RMENU(165),
+	K_BROWSER_BACK(166),
+	K_BROWSER_FORWARD(167),
+	K_BROWSER_REFRESH(168),
+	K_BROWSER_STOP(169),
+	K_BROWSER_SEARCH(170),
+	K_BROWSER_FAVORITES(171),
+	K_BROWSER_HOME(172),
+	K_VOLUME_MUTE(173),
+	K_VOLUME_DOWN(174),
+	K_VOLUME_UP(175),
+	K_MEDIA_NEXT_TRACK(176),
+	K_MEDIA_PREV_TRACK(177),
+	K_MEDIA_STOP(178),
+	K_MEDIA_PLAY_PAUSE(179),
+	K_LAUNCH_MAIL(180),
+	K_LAUNCH_MEDIA_SELECT(181),
+	K_LAUNCH_APP1(182),
+	K_LAUNCH_APP2(183),
+	__RESERVED_B8(184),
+	__RESERVED_B9(185),
+	K_OEM_1(186),
+	K_OEM_PLUS(187),
+	K_OEM_COMMA(188),
+	K_OEM_MINUS(189),
+	K_OEM_PERIOD(190),
+	K_OEM_2(191),
+	K_OEM_3(192),
+	K_OEM_4(219),
+	K_OEM_5(220),
+	K_OEM_6(221),
+	K_OEM_7(222),
+	K_OEM_8(223),
+	__RESERVED_E0(224),
+	K_OEM_AX(225),
+	K_OEM_102(226),
+	K_ICO_HELP(227),
+	K_ICO_00(228),
+	K_PROCESSKEY(229),
+	K_ICO_CLEAR(230),
+	K_PACKET(231),
+	__UNASSIGNED_E8(232),
+	K_OEM_RESET(233),
+	K_OEM_JUMP(234),
+	K_OEM_PA1(235),
+	K_OEM_PA2(236),
+	K_OEM_PA3(237),
+	K_OEM_WSCTRL(238),
+	K_OEM_CUSEL(239),
+	K_OEM_ATTN(240),
+	K_OEM_FINISH(241),
+	K_OEM_COPY(242),
+	K_OEM_AUTO(243),
+	K_OEM_ENLW(244),
+	K_OEM_BACKTAB(245),
+	K_ATTN(246),
+	K_CRSEL(247),
+	K_EXSEL(248),
+	K_EREOF(249),
+	K_PLAY(250),
+	K_ZOOM(251),
+	K_NONAME(252),
+	K_PA1(253),
+	K_OEM_CLEAR(254);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Key(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/Latency/Enum.java b/generated/bwapi4/Latency/Enum.java
new file mode 100644
index 0000000..6bb6bc2
--- /dev/null
+++ b/generated/bwapi4/Latency/Enum.java
@@ -0,0 +1,29 @@
+package bwapi4.Latency;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	SinglePlayer(2),
+	LanLow(5),
+	LanMedium(7),
+	LanHigh(9),
+	BattlenetLow(14),
+	BattlenetMedium(19);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/Mirror.java b/generated/bwapi4/Mirror.java
new file mode 100644
index 0000000..59235f0
--- /dev/null
+++ b/generated/bwapi4/Mirror.java
@@ -0,0 +1,262 @@
+package bwapi4;
+
+import bwapi4.AIModule;
+import bwapi4.BWEventListener;
+
+import java.io.*;
+import java.io.File;
+import java.lang.Exception;
+import java.lang.UnsupportedOperationException;
+import java.util.*;
+import java.util.zip.*;
+
+/**
+ * <p>The API entry point. Standard use case:</p>
+ * <ul>
+ *     <li>Create a Mirror object and use {@link #getModule()} and then set an {@link AIModule}'s {@link BWEventListener}<br/>
+ *     <li>Call {@link #startGame()} to init the API and connect to Broodwar, then launch Broodwar from ChaosLauncher.</li>
+ *     <li>In you {@link BWEventListener#onStart()} method, receive the Game object by calling {@link #getGame()}</li>
+ * </ul>
+ * <br/>
+ * <b>Example</b>
+ * <pre>
+ *     {@code
+ *
+ *     mirror.getModule().setEventListener(new DefaultBWListener()
+ *     {
+ *            public void onStart() {
+ *                game = mirror.getGame();
+ *                self = game.self();
+ *                //initialization
+ *                ....
+ *            }
+ *
+ *           public void onUpdate() {
+ *               for (Unit myUnit : self.getUnits()) {
+ *                   //give orders to unit
+ *                   ...
+ *                }
+ *           }
+ *        });
+ *     }
+ *     mirror.startGame();
+ * </pre>
+
+ * <p><b>Note:</b> The Game object is initialized during the {@link #startGame()} as well as other BWMirror API's constants.
+ * Do not use any API releated methods/fields prior to {@link #startGame()}.</p>
+
+ */
+public class Mirror {
+
+    private Game game;
+
+    private AIModule module = new AIModule();
+
+    private FrameCallback frameCallback;
+
+    private static final boolean EXTRACT_JAR = true;
+
+    private static final String VERSION = "2_0";
+
+    static {
+        String arch = System.getProperty("os.arch");
+        String dllNames[] = {"BWAPI4", "gmp-vc90-mt", "mpfr-vc90-mt"};
+        if(!arch.equals("x86")){
+            throw new UnsupportedOperationException("BWMirror API supports only x86 architecture.");
+        }
+        try {
+            if (EXTRACT_JAR) {
+                System.setProperty("java.library.path", ".");
+                java.lang.reflect.Field fieldSysPath = ClassLoader.class.getDeclaredField("sys_paths");
+                fieldSysPath.setAccessible(true);
+                fieldSysPath.set(null, null);
+
+                String path = Mirror.class.getProtectionDomain().getCodeSource().getLocation().getPath();
+                String decodedPath = java.net.URLDecoder.decode(path, "UTF-8");
+
+                for (String dllName : dllNames) {
+                    String dllNameExt = dllName + ".dll";
+                    if (!new File(dllNameExt).exists()) {
+                        JarResources jar = new JarResources(path);
+                        byte[] correctDllData = jar.getResource(dllNameExt);
+                        FileOutputStream funnyStream = new FileOutputStream(dllNameExt);
+                        funnyStream.write(correctDllData);
+                        funnyStream.close();
+                    }
+                }
+            }
+        } catch (Exception e) {
+            System.err.println("Failed to extract native libraries.\n" + e);
+        }
+
+        System.loadLibrary(dllNames[0]);
+
+        File dataDir = new File("bwapi-data/BWTA");
+        if(!dataDir.exists()){
+            try {
+                dataDir.mkdirs();
+            } catch (Exception e) {
+                System.err.println("Unable to create /bwapi-data/BWTA folder, BWTA analysis will not be saved.");
+            }
+        }
+    }
+
+    public Game getGame() {
+        return game;
+    }
+
+    public AIModule getModule() {
+        return module;
+    }
+
+    /**
+     * Starts the API, initializes all constants ( {@link UnitType}, {@link WeaponType} ) and the {@link Game} object.
+     * This method blocks until the end of game.
+     */
+    public native void startGame();
+
+    private void update() {
+        if (frameCallback != null) {
+            frameCallback.update();
+        }
+    }
+
+    /*public void setFrameCallback(bwapi.Mirror.FrameCallback frameCallback) {
+        this.frameCallback = frameCallback;
+    } */
+
+    /**
+     * The simplest interface to receive update event from Broodwar. The {@link #update()} method is called once each frame.
+     * For a simple bot and implementation of this interface is enough, to receive all in game events, implement {@link BWEventListener}.
+     */
+    /*public*/ private interface FrameCallback {
+        public void update();
+    }
+
+    @SuppressWarnings({"unchecked"})
+    private static class JarResources {
+
+        // external debug flag
+        public boolean debugOn = false;
+
+        // jar resource mapping tables
+        private Hashtable htSizes = new Hashtable();
+        private Hashtable htJarContents = new Hashtable();
+
+        // a jar file
+        private String jarFileName;
+
+        /**
+         * creates a javabot.JarResources. It extracts all resources from a Jar
+         * into an internal hashtable, keyed by resource names.
+         *
+         * @param jarFileName a jar or zip file
+         */
+        public JarResources(String jarFileName) {
+            this.jarFileName = jarFileName;
+            init();
+        }
+
+        /**
+         * Extracts a jar resource as a blob.
+         *
+         * @param name a resource name.
+         */
+        public byte[] getResource(String name) {
+            return (byte[]) htJarContents.get(name);
+        }
+
+        /**
+         * initializes internal hash tables with Jar file resources.
+         */
+        private void init() {
+            try {
+                // extracts just sizes only.
+                ZipFile zf = new ZipFile(jarFileName);
+                Enumeration e = zf.entries();
+                while (e.hasMoreElements()) {
+                    ZipEntry ze = (ZipEntry) e.nextElement();
+                    if (debugOn) {
+                        System.out.println(dumpZipEntry(ze));
+                    }
+                    htSizes.put(ze.getName(), new Integer((int) ze.getSize()));
+                }
+                zf.close();
+
+                // extract resources and put them into the hashtable.
+                FileInputStream fis = new FileInputStream(jarFileName);
+                BufferedInputStream bis = new BufferedInputStream(fis);
+                ZipInputStream zis = new ZipInputStream(bis);
+                ZipEntry ze = null;
+                while ((ze = zis.getNextEntry()) != null) {
+                    if (ze.isDirectory()) {
+                        continue;
+                    }
+                    if (debugOn) {
+                        System.out.println(
+                                "ze.getName()=" + ze.getName() + "," + "getSize()=" + ze.getSize()
+                        );
+                    }
+                    int size = (int) ze.getSize();
+                    // -1 means unknown size.
+                    if (size == -1) {
+                        size = ((Integer) htSizes.get(ze.getName())).intValue();
+                    }
+                    byte[] b = new byte[(int) size];
+                    int rb = 0;
+                    int chunk = 0;
+                    while (((int) size - rb) > 0) {
+                        chunk = zis.read(b, rb, (int) size - rb);
+                        if (chunk == -1) {
+                            break;
+                        }
+                        rb += chunk;
+                    }
+                    // add to internal resource hashtable
+                    htJarContents.put(ze.getName(), b);
+                    if (debugOn) {
+                        System.out.println(
+                                ze.getName() + "  rb=" + rb +
+                                        ",size=" + size +
+                                        ",csize=" + ze.getCompressedSize()
+                        );
+                    }
+                }
+            } catch (NullPointerException e) {
+                System.out.println("done.");
+            } catch (FileNotFoundException e) {
+                e.printStackTrace();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+
+        /**
+         * Dumps a zip entry into a string.
+         *
+         * @param ze a ZipEntry
+         */
+        private String dumpZipEntry(ZipEntry ze) {
+            StringBuffer sb = new StringBuffer();
+            if (ze.isDirectory()) {
+                sb.append("d ");
+            } else {
+                sb.append("f ");
+            }
+            if (ze.getMethod() == ZipEntry.STORED) {
+                sb.append("stored   ");
+            } else {
+                sb.append("defalted ");
+            }
+            sb.append(ze.getName());
+            sb.append("\t");
+            sb.append("" + ze.getSize());
+            if (ze.getMethod() == ZipEntry.DEFLATED) {
+                sb.append("/" + ze.getCompressedSize());
+            }
+            return (sb.toString());
+        }
+
+
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/MouseButton.java b/generated/bwapi4/MouseButton.java
new file mode 100644
index 0000000..a93843a
--- /dev/null
+++ b/generated/bwapi4/MouseButton.java
@@ -0,0 +1,27 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum MouseButton {
+
+	M_LEFT(0),
+	M_RIGHT(1),
+	M_MIDDLE(2),
+	M_MAX(3);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	MouseButton(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/Order.java b/generated/bwapi4/Order.java
new file mode 100644
index 0000000..7986a9c
--- /dev/null
+++ b/generated/bwapi4/Order.java
@@ -0,0 +1,346 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Order {
+
+    public static Order Die;
+
+    public static Order Stop;
+
+    public static Order Guard;
+
+    public static Order PlayerGuard;
+
+    public static Order TurretGuard;
+
+    public static Order BunkerGuard;
+
+    public static Order Move;
+
+    public static Order AttackUnit;
+
+    public static Order AttackTile;
+
+    public static Order Hover;
+
+    public static Order AttackMove;
+
+    public static Order InfestedCommandCenter;
+
+    public static Order UnusedNothing;
+
+    public static Order UnusedPowerup;
+
+    public static Order TowerGuard;
+
+    public static Order VultureMine;
+
+    public static Order Nothing;
+
+    public static Order CastInfestation;
+
+    public static Order InfestingCommandCenter;
+
+    public static Order PlaceBuilding;
+
+    public static Order CreateProtossBuilding;
+
+    public static Order ConstructingBuilding;
+
+    public static Order Repair;
+
+    public static Order PlaceAddon;
+
+    public static Order BuildAddon;
+
+    public static Order Train;
+
+    public static Order RallyPointUnit;
+
+    public static Order RallyPointTile;
+
+    public static Order ZergBirth;
+
+    public static Order ZergUnitMorph;
+
+    public static Order ZergBuildingMorph;
+
+    public static Order IncompleteBuilding;
+
+    public static Order BuildNydusExit;
+
+    public static Order EnterNydusCanal;
+
+    public static Order Follow;
+
+    public static Order Carrier;
+
+    public static Order ReaverCarrierMove;
+
+    public static Order CarrierIgnore2;
+
+    public static Order Reaver;
+
+    public static Order TrainFighter;
+
+    public static Order InterceptorAttack;
+
+    public static Order ScarabAttack;
+
+    public static Order RechargeShieldsUnit;
+
+    public static Order RechargeShieldsBattery;
+
+    public static Order ShieldBattery;
+
+    public static Order InterceptorReturn;
+
+    public static Order BuildingLand;
+
+    public static Order BuildingLiftOff;
+
+    public static Order DroneLiftOff;
+
+    public static Order LiftingOff;
+
+    public static Order ResearchTech;
+
+    public static Order Upgrade;
+
+    public static Order Larva;
+
+    public static Order SpawningLarva;
+
+    public static Order Harvest1;
+
+    public static Order Harvest2;
+
+    public static Order MoveToGas;
+
+    public static Order WaitForGas;
+
+    public static Order HarvestGas;
+
+    public static Order ReturnGas;
+
+    public static Order MoveToMinerals;
+
+    public static Order WaitForMinerals;
+
+    public static Order MiningMinerals;
+
+    public static Order Harvest3;
+
+    public static Order Harvest4;
+
+    public static Order ReturnMinerals;
+
+    public static Order Interrupted;
+
+    public static Order EnterTransport;
+
+    public static Order PickupIdle;
+
+    public static Order PickupTransport;
+
+    public static Order PickupBunker;
+
+    public static Order Pickup4;
+
+    public static Order PowerupIdle;
+
+    public static Order Sieging;
+
+    public static Order Unsieging;
+
+    public static Order InitCreepGrowth;
+
+    public static Order SpreadCreep;
+
+    public static Order StoppingCreepGrowth;
+
+    public static Order GuardianAspect;
+
+    public static Order ArchonWarp;
+
+    public static Order CompletingArchonSummon;
+
+    public static Order HoldPosition;
+
+    public static Order Cloak;
+
+    public static Order Decloak;
+
+    public static Order Unload;
+
+    public static Order MoveUnload;
+
+    public static Order FireYamatoGun;
+
+    public static Order CastLockdown;
+
+    public static Order Burrowing;
+
+    public static Order Burrowed;
+
+    public static Order Unburrowing;
+
+    public static Order CastDarkSwarm;
+
+    public static Order CastParasite;
+
+    public static Order CastSpawnBroodlings;
+
+    public static Order CastEMPShockwave;
+
+    public static Order NukeWait;
+
+    public static Order NukeTrain;
+
+    public static Order NukeLaunch;
+
+    public static Order NukePaint;
+
+    public static Order NukeUnit;
+
+    public static Order CastNuclearStrike;
+
+    public static Order NukeTrack;
+
+    public static Order CloakNearbyUnits;
+
+    public static Order PlaceMine;
+
+    public static Order RightClickAction;
+
+    public static Order CastRecall;
+
+    public static Order Teleport;
+
+    public static Order CastScannerSweep;
+
+    public static Order Scanner;
+
+    public static Order CastDefensiveMatrix;
+
+    public static Order CastPsionicStorm;
+
+    public static Order CastIrradiate;
+
+    public static Order CastPlague;
+
+    public static Order CastConsume;
+
+    public static Order CastEnsnare;
+
+    public static Order CastStasisField;
+
+    public static Order CastHallucination;
+
+    public static Order Hallucination2;
+
+    public static Order ResetCollision;
+
+    public static Order Patrol;
+
+    public static Order CTFCOPInit;
+
+    public static Order CTFCOPStarted;
+
+    public static Order CTFCOP2;
+
+    public static Order ComputerAI;
+
+    public static Order AtkMoveEP;
+
+    public static Order HarassMove;
+
+    public static Order AIPatrol;
+
+    public static Order GuardPost;
+
+    public static Order RescuePassive;
+
+    public static Order Neutral;
+
+    public static Order ComputerReturn;
+
+    public static Order SelfDestructing;
+
+    public static Order Critter;
+
+    public static Order HiddenGun;
+
+    public static Order OpenDoor;
+
+    public static Order CloseDoor;
+
+    public static Order HideTrap;
+
+    public static Order RevealTrap;
+
+    public static Order EnableDoodad;
+
+    public static Order DisableDoodad;
+
+    public static Order WarpIn;
+
+    public static Order Medic;
+
+    public static Order MedicHeal;
+
+    public static Order HealMove;
+
+    public static Order MedicHealToIdle;
+
+    public static Order CastRestoration;
+
+    public static Order CastDisruptionWeb;
+
+    public static Order CastMindControl;
+
+    public static Order DarkArchonMeld;
+
+    public static Order CastFeedback;
+
+    public static Order CastOpticalFlare;
+
+    public static Order CastMaelstrom;
+
+    public static Order JunkYardDog;
+
+    public static Order Fatal;
+
+    public static Order None;
+
+    public static Order Unknown;
+
+
+    private static Map<Long, Order> instances = new HashMap<Long, Order>();
+
+    private Order(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Order get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Order instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Order(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi4/Player.java b/generated/bwapi4/Player.java
new file mode 100644
index 0000000..ba47b47
--- /dev/null
+++ b/generated/bwapi4/Player.java
@@ -0,0 +1,400 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Player {
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public String getName() {
+        return getName_native(pointer);
+    }
+
+    public List<Unit> getUnits() {
+        return getUnits_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public PlayerType getType() {
+        return getType_native(pointer);
+    }
+
+    public Force getForce() {
+        return getForce_native(pointer);
+    }
+
+    public boolean isAlly(Player player) {
+        return isAlly_native(pointer, player);
+    }
+
+    public boolean isEnemy(Player player) {
+        return isEnemy_native(pointer, player);
+    }
+
+    public boolean isNeutral() {
+        return isNeutral_native(pointer);
+    }
+
+    public TilePosition getStartLocation() {
+        return getStartLocation_native(pointer);
+    }
+
+    public boolean isVictorious() {
+        return isVictorious_native(pointer);
+    }
+
+    public boolean isDefeated() {
+        return isDefeated_native(pointer);
+    }
+
+    public boolean leftGame() {
+        return leftGame_native(pointer);
+    }
+
+    public int minerals() {
+        return minerals_native(pointer);
+    }
+
+    public int gas() {
+        return gas_native(pointer);
+    }
+
+    public int gatheredMinerals() {
+        return gatheredMinerals_native(pointer);
+    }
+
+    public int gatheredGas() {
+        return gatheredGas_native(pointer);
+    }
+
+    public int repairedMinerals() {
+        return repairedMinerals_native(pointer);
+    }
+
+    public int repairedGas() {
+        return repairedGas_native(pointer);
+    }
+
+    public int refundedMinerals() {
+        return refundedMinerals_native(pointer);
+    }
+
+    public int refundedGas() {
+        return refundedGas_native(pointer);
+    }
+
+    public int spentMinerals() {
+        return spentMinerals_native(pointer);
+    }
+
+    public int spentGas() {
+        return spentGas_native(pointer);
+    }
+
+    public int supplyTotal() {
+        return supplyTotal_native(pointer);
+    }
+
+    public int supplyTotal(Race race) {
+        return supplyTotal_native(pointer, race);
+    }
+
+    public int supplyUsed() {
+        return supplyUsed_native(pointer);
+    }
+
+    public int supplyUsed(Race race) {
+        return supplyUsed_native(pointer, race);
+    }
+
+    public int allUnitCount() {
+        return allUnitCount_native(pointer);
+    }
+
+    public int allUnitCount(UnitType unit) {
+        return allUnitCount_native(pointer, unit);
+    }
+
+    public int visibleUnitCount() {
+        return visibleUnitCount_native(pointer);
+    }
+
+    public int visibleUnitCount(UnitType unit) {
+        return visibleUnitCount_native(pointer, unit);
+    }
+
+    public int completedUnitCount() {
+        return completedUnitCount_native(pointer);
+    }
+
+    public int completedUnitCount(UnitType unit) {
+        return completedUnitCount_native(pointer, unit);
+    }
+
+    public int incompleteUnitCount() {
+        return incompleteUnitCount_native(pointer);
+    }
+
+    public int incompleteUnitCount(UnitType unit) {
+        return incompleteUnitCount_native(pointer, unit);
+    }
+
+    public int deadUnitCount() {
+        return deadUnitCount_native(pointer);
+    }
+
+    public int deadUnitCount(UnitType unit) {
+        return deadUnitCount_native(pointer, unit);
+    }
+
+    public int killedUnitCount() {
+        return killedUnitCount_native(pointer);
+    }
+
+    public int killedUnitCount(UnitType unit) {
+        return killedUnitCount_native(pointer, unit);
+    }
+
+    public int getUpgradeLevel(UpgradeType upgrade) {
+        return getUpgradeLevel_native(pointer, upgrade);
+    }
+
+    public boolean hasResearched(TechType tech) {
+        return hasResearched_native(pointer, tech);
+    }
+
+    public boolean isResearching(TechType tech) {
+        return isResearching_native(pointer, tech);
+    }
+
+    public boolean isUpgrading(UpgradeType upgrade) {
+        return isUpgrading_native(pointer, upgrade);
+    }
+
+    public Color getColor() {
+        return getColor_native(pointer);
+    }
+
+    public char getTextColor() {
+        return getTextColor_native(pointer);
+    }
+
+    public int maxEnergy(UnitType unit) {
+        return maxEnergy_native(pointer, unit);
+    }
+
+    public double topSpeed(UnitType unit) {
+        return topSpeed_native(pointer, unit);
+    }
+
+    public int weaponMaxRange(WeaponType weapon) {
+        return weaponMaxRange_native(pointer, weapon);
+    }
+
+    public int sightRange(UnitType unit) {
+        return sightRange_native(pointer, unit);
+    }
+
+    public int weaponDamageCooldown(UnitType unit) {
+        return weaponDamageCooldown_native(pointer, unit);
+    }
+
+    public int armor(UnitType unit) {
+        return armor_native(pointer, unit);
+    }
+
+    public int damage(WeaponType wpn) {
+        return damage_native(pointer, wpn);
+    }
+
+    public int getUnitScore() {
+        return getUnitScore_native(pointer);
+    }
+
+    public int getKillScore() {
+        return getKillScore_native(pointer);
+    }
+
+    public int getBuildingScore() {
+        return getBuildingScore_native(pointer);
+    }
+
+    public int getRazingScore() {
+        return getRazingScore_native(pointer);
+    }
+
+    public int getCustomScore() {
+        return getCustomScore_native(pointer);
+    }
+
+    public boolean isObserver() {
+        return isObserver_native(pointer);
+    }
+
+    public int getMaxUpgradeLevel(UpgradeType upgrade) {
+        return getMaxUpgradeLevel_native(pointer, upgrade);
+    }
+
+    public boolean isResearchAvailable(TechType tech) {
+        return isResearchAvailable_native(pointer, tech);
+    }
+
+    public boolean isUnitAvailable(UnitType unit) {
+        return isUnitAvailable_native(pointer, unit);
+    }
+
+
+    private static Map<Long, Player> instances = new HashMap<Long, Player>();
+
+    private Player(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Player get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Player instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Player(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native String getName_native(long pointer);
+
+    private native List<Unit> getUnits_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native PlayerType getType_native(long pointer);
+
+    private native Force getForce_native(long pointer);
+
+    private native boolean isAlly_native(long pointer, Player player);
+
+    private native boolean isEnemy_native(long pointer, Player player);
+
+    private native boolean isNeutral_native(long pointer);
+
+    private native TilePosition getStartLocation_native(long pointer);
+
+    private native boolean isVictorious_native(long pointer);
+
+    private native boolean isDefeated_native(long pointer);
+
+    private native boolean leftGame_native(long pointer);
+
+    private native int minerals_native(long pointer);
+
+    private native int gas_native(long pointer);
+
+    private native int gatheredMinerals_native(long pointer);
+
+    private native int gatheredGas_native(long pointer);
+
+    private native int repairedMinerals_native(long pointer);
+
+    private native int repairedGas_native(long pointer);
+
+    private native int refundedMinerals_native(long pointer);
+
+    private native int refundedGas_native(long pointer);
+
+    private native int spentMinerals_native(long pointer);
+
+    private native int spentGas_native(long pointer);
+
+    private native int supplyTotal_native(long pointer);
+
+    private native int supplyTotal_native(long pointer, Race race);
+
+    private native int supplyUsed_native(long pointer);
+
+    private native int supplyUsed_native(long pointer, Race race);
+
+    private native int allUnitCount_native(long pointer);
+
+    private native int allUnitCount_native(long pointer, UnitType unit);
+
+    private native int visibleUnitCount_native(long pointer);
+
+    private native int visibleUnitCount_native(long pointer, UnitType unit);
+
+    private native int completedUnitCount_native(long pointer);
+
+    private native int completedUnitCount_native(long pointer, UnitType unit);
+
+    private native int incompleteUnitCount_native(long pointer);
+
+    private native int incompleteUnitCount_native(long pointer, UnitType unit);
+
+    private native int deadUnitCount_native(long pointer);
+
+    private native int deadUnitCount_native(long pointer, UnitType unit);
+
+    private native int killedUnitCount_native(long pointer);
+
+    private native int killedUnitCount_native(long pointer, UnitType unit);
+
+    private native int getUpgradeLevel_native(long pointer, UpgradeType upgrade);
+
+    private native boolean hasResearched_native(long pointer, TechType tech);
+
+    private native boolean isResearching_native(long pointer, TechType tech);
+
+    private native boolean isUpgrading_native(long pointer, UpgradeType upgrade);
+
+    private native Color getColor_native(long pointer);
+
+    private native char getTextColor_native(long pointer);
+
+    private native int maxEnergy_native(long pointer, UnitType unit);
+
+    private native double topSpeed_native(long pointer, UnitType unit);
+
+    private native int weaponMaxRange_native(long pointer, WeaponType weapon);
+
+    private native int sightRange_native(long pointer, UnitType unit);
+
+    private native int weaponDamageCooldown_native(long pointer, UnitType unit);
+
+    private native int armor_native(long pointer, UnitType unit);
+
+    private native int damage_native(long pointer, WeaponType wpn);
+
+    private native int getUnitScore_native(long pointer);
+
+    private native int getKillScore_native(long pointer);
+
+    private native int getBuildingScore_native(long pointer);
+
+    private native int getRazingScore_native(long pointer);
+
+    private native int getCustomScore_native(long pointer);
+
+    private native boolean isObserver_native(long pointer);
+
+    private native int getMaxUpgradeLevel_native(long pointer, UpgradeType upgrade);
+
+    private native boolean isResearchAvailable_native(long pointer, TechType tech);
+
+    private native boolean isUnitAvailable_native(long pointer, UnitType unit);
+
+
+}
diff --git a/generated/bwapi4/PlayerType.java b/generated/bwapi4/PlayerType.java
new file mode 100644
index 0000000..ef247f6
--- /dev/null
+++ b/generated/bwapi4/PlayerType.java
@@ -0,0 +1,74 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class PlayerType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public boolean isLobbyType() {
+        return isLobbyType_native(pointer);
+    }
+
+    public boolean isGameType() {
+        return isGameType_native(pointer);
+    }
+
+    public static PlayerType None;
+
+    public static PlayerType Computer;
+
+    public static PlayerType Player;
+
+    public static PlayerType RescuePassive;
+
+    public static PlayerType EitherPreferComputer;
+
+    public static PlayerType EitherPreferHuman;
+
+    public static PlayerType Neutral;
+
+    public static PlayerType Closed;
+
+    public static PlayerType PlayerLeft;
+
+    public static PlayerType ComputerLeft;
+
+    public static PlayerType Unknown;
+
+
+    private static Map<Long, PlayerType> instances = new HashMap<Long, PlayerType>();
+
+    private PlayerType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static PlayerType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        PlayerType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new PlayerType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native boolean isLobbyType_native(long pointer);
+
+    private native boolean isGameType_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Playerset.java b/generated/bwapi4/Playerset.java
new file mode 100644
index 0000000..3c3d885
--- /dev/null
+++ b/generated/bwapi4/Playerset.java
@@ -0,0 +1,58 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Playerset {
+
+    public List<Unit> getUnits() {
+        return getUnits_native(pointer);
+    }
+
+    public void setAlliance(boolean allies) {
+        setAlliance_native(pointer, allies);
+    }
+
+    public void setAlliance() {
+        setAlliance_native(pointer);
+    }
+
+    public void setAlliance(boolean allies, boolean alliedVictory) {
+        setAlliance_native(pointer, allies, alliedVictory);
+    }
+
+
+    private static Map<Long, Playerset> instances = new HashMap<Long, Playerset>();
+
+    private Playerset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Playerset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Playerset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Playerset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native List<Unit> getUnits_native(long pointer);
+
+    private native void setAlliance_native(long pointer, boolean allies);
+
+    private native void setAlliance_native(long pointer);
+
+    private native void setAlliance_native(long pointer, boolean allies, boolean alliedVictory);
+
+
+}
diff --git a/generated/bwapi4/Position.java b/generated/bwapi4/Position.java
new file mode 100644
index 0000000..cf68087
--- /dev/null
+++ b/generated/bwapi4/Position.java
@@ -0,0 +1,86 @@
+package bwapi4;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Positions are measured in pixels and are the highest resolution.
+ */
+public class Position extends AbstractPoint<Position>{
+
+    private int x, y;
+
+    public Position(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public String toString() {
+        return "[" + x + ", " + y + "]";
+    }
+
+    public native boolean isValid();
+
+    public native Position makeValid();
+
+    public native int getApproxDistance(Position position);
+
+    public native double getLength();
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public static Position Invalid;
+
+    public static Position None;
+
+    public static Position Unknown;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof Position)) return false;
+
+        Position position = (Position) o;
+
+        if (x != position.x) return false;
+        if (y != position.y) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x;
+        result = 31 * result + y;
+        return result;
+    }
+
+
+    private static Map<Long, Position> instances = new HashMap<Long, Position>();
+
+    private Position(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Position get(long pointer) {
+        Position instance = instances.get(pointer);
+        if (instance == null) {
+            instance = new Position(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    public Position getPoint(){
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/PositionOrUnit.java b/generated/bwapi4/PositionOrUnit.java
new file mode 100644
index 0000000..b371c13
--- /dev/null
+++ b/generated/bwapi4/PositionOrUnit.java
@@ -0,0 +1,55 @@
+package bwapi4;
+
+import java.lang.IllegalArgumentException;
+import java.lang.Object;
+import java.lang.Override;
+
+public class PositionOrUnit {
+
+    private Unit unit;
+
+    private Position position;
+
+    public PositionOrUnit(Unit unit){
+        if(unit == null){
+            throw new IllegalArgumentException("PositionOrUnit must not reference null!");
+        };
+        this.unit = unit;
+    }
+
+    public PositionOrUnit(Position position){
+        if(position == null){
+            throw new IllegalArgumentException("PositionOrUnit must not reference null!");
+        };
+        this.position = position;
+    }
+
+    public Unit getUnit(){
+        return unit;
+    }
+
+    public Position getPosition() {
+        return position;
+    }
+
+    public boolean isUnit(){
+        return unit != null;
+    }
+
+    public boolean isPosition(){
+        return position != null;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof PositionOrUnit)) return false;
+
+        PositionOrUnit that = (PositionOrUnit) o;
+
+        if (position != null ? !position.equals(that.position) : that.position != null) return false;
+        if (unit != null ? !unit.equals(that.unit) : that.unit != null) return false;
+
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/PositionedObject.java b/generated/bwapi4/PositionedObject.java
new file mode 100644
index 0000000..d739a6a
--- /dev/null
+++ b/generated/bwapi4/PositionedObject.java
@@ -0,0 +1,15 @@
+package bwapi4;
+
+import bwapi4.Position;
+
+/**
+ * Interrmediate class used to translate getPoint() calls to getPosition() calls.
+ */
+public abstract class PositionedObject extends AbstractPoint<Position> {
+
+    public Position getPoint(){
+        return getPosition();
+    }
+
+    public abstract Position getPosition();
+}
\ No newline at end of file
diff --git a/generated/bwapi4/Race.java b/generated/bwapi4/Race.java
new file mode 100644
index 0000000..578a3ae
--- /dev/null
+++ b/generated/bwapi4/Race.java
@@ -0,0 +1,82 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Race {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public UnitType getWorker() {
+        return getWorker_native(pointer);
+    }
+
+    public UnitType getCenter() {
+        return getCenter_native(pointer);
+    }
+
+    public UnitType getRefinery() {
+        return getRefinery_native(pointer);
+    }
+
+    public UnitType getTransport() {
+        return getTransport_native(pointer);
+    }
+
+    public UnitType getSupplyProvider() {
+        return getSupplyProvider_native(pointer);
+    }
+
+    public static Race Zerg;
+
+    public static Race Terran;
+
+    public static Race Protoss;
+
+    public static Race Random;
+
+    public static Race None;
+
+    public static Race Unknown;
+
+
+    private static Map<Long, Race> instances = new HashMap<Long, Race>();
+
+    private Race(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Race get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Race instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Race(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native UnitType getWorker_native(long pointer);
+
+    private native UnitType getCenter_native(long pointer);
+
+    private native UnitType getRefinery_native(long pointer);
+
+    private native UnitType getTransport_native(long pointer);
+
+    private native UnitType getSupplyProvider_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Region.java b/generated/bwapi4/Region.java
new file mode 100644
index 0000000..ecda2f3
--- /dev/null
+++ b/generated/bwapi4/Region.java
@@ -0,0 +1,120 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+import bwapi4.CenteredObject;
+
+public class Region extends CenteredObject 
+{
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public int getRegionGroupID() {
+        return getRegionGroupID_native(pointer);
+    }
+
+    public Position getCenter() {
+        return getCenter_native(pointer);
+    }
+
+    public boolean isHigherGround() {
+        return isHigherGround_native(pointer);
+    }
+
+    public int getDefensePriority() {
+        return getDefensePriority_native(pointer);
+    }
+
+    public boolean isAccessible() {
+        return isAccessible_native(pointer);
+    }
+
+    public List<Region> getNeighbors() {
+        return getNeighbors_native(pointer);
+    }
+
+    public int getBoundsLeft() {
+        return getBoundsLeft_native(pointer);
+    }
+
+    public int getBoundsTop() {
+        return getBoundsTop_native(pointer);
+    }
+
+    public int getBoundsRight() {
+        return getBoundsRight_native(pointer);
+    }
+
+    public int getBoundsBottom() {
+        return getBoundsBottom_native(pointer);
+    }
+
+    public Region getClosestAccessibleRegion() {
+        return getClosestAccessibleRegion_native(pointer);
+    }
+
+    public Region getClosestInaccessibleRegion() {
+        return getClosestInaccessibleRegion_native(pointer);
+    }
+
+    public int getDistance(Region other) {
+        return getDistance_native(pointer, other);
+    }
+
+
+    private static Map<Long, Region> instances = new HashMap<Long, Region>();
+
+    private Region(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Region get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Region instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Region(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native int getRegionGroupID_native(long pointer);
+
+    private native Position getCenter_native(long pointer);
+
+    private native boolean isHigherGround_native(long pointer);
+
+    private native int getDefensePriority_native(long pointer);
+
+    private native boolean isAccessible_native(long pointer);
+
+    private native List<Region> getNeighbors_native(long pointer);
+
+    private native int getBoundsLeft_native(long pointer);
+
+    private native int getBoundsTop_native(long pointer);
+
+    private native int getBoundsRight_native(long pointer);
+
+    private native int getBoundsBottom_native(long pointer);
+
+    private native Region getClosestAccessibleRegion_native(long pointer);
+
+    private native Region getClosestInaccessibleRegion_native(long pointer);
+
+    private native int getDistance_native(long pointer, Region other);
+
+
+}
diff --git a/generated/bwapi4/Regionset.java b/generated/bwapi4/Regionset.java
new file mode 100644
index 0000000..574730c
--- /dev/null
+++ b/generated/bwapi4/Regionset.java
@@ -0,0 +1,40 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Regionset {
+
+    public Position getCenter() {
+        return getCenter_native(pointer);
+    }
+
+
+    private static Map<Long, Regionset> instances = new HashMap<Long, Regionset>();
+
+    private Regionset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Regionset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Regionset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Regionset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native Position getCenter_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/ShapeType/Enum.java b/generated/bwapi4/ShapeType/Enum.java
new file mode 100644
index 0000000..9118876
--- /dev/null
+++ b/generated/bwapi4/ShapeType/Enum.java
@@ -0,0 +1,30 @@
+package bwapi4.ShapeType;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	None(0),
+	Text(1),
+	Box(2),
+	Triangle(3),
+	Circle(4),
+	Ellipse(5),
+	Dot(6);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/TechType.java b/generated/bwapi4/TechType.java
new file mode 100644
index 0000000..8cff9e5
--- /dev/null
+++ b/generated/bwapi4/TechType.java
@@ -0,0 +1,172 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class TechType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public int mineralPrice() {
+        return mineralPrice_native(pointer);
+    }
+
+    public int gasPrice() {
+        return gasPrice_native(pointer);
+    }
+
+    public int researchTime() {
+        return researchTime_native(pointer);
+    }
+
+    public int energyCost() {
+        return energyCost_native(pointer);
+    }
+
+    public UnitType whatResearches() {
+        return whatResearches_native(pointer);
+    }
+
+    public WeaponType getWeapon() {
+        return getWeapon_native(pointer);
+    }
+
+    public boolean targetsUnit() {
+        return targetsUnit_native(pointer);
+    }
+
+    public boolean targetsPosition() {
+        return targetsPosition_native(pointer);
+    }
+
+    public Order getOrder() {
+        return getOrder_native(pointer);
+    }
+
+    public static TechType Stim_Packs;
+
+    public static TechType Lockdown;
+
+    public static TechType EMP_Shockwave;
+
+    public static TechType Spider_Mines;
+
+    public static TechType Scanner_Sweep;
+
+    public static TechType Tank_Siege_Mode;
+
+    public static TechType Defensive_Matrix;
+
+    public static TechType Irradiate;
+
+    public static TechType Yamato_Gun;
+
+    public static TechType Cloaking_Field;
+
+    public static TechType Personnel_Cloaking;
+
+    public static TechType Burrowing;
+
+    public static TechType Infestation;
+
+    public static TechType Spawn_Broodlings;
+
+    public static TechType Dark_Swarm;
+
+    public static TechType Plague;
+
+    public static TechType Consume;
+
+    public static TechType Ensnare;
+
+    public static TechType Parasite;
+
+    public static TechType Psionic_Storm;
+
+    public static TechType Hallucination;
+
+    public static TechType Recall;
+
+    public static TechType Stasis_Field;
+
+    public static TechType Archon_Warp;
+
+    public static TechType Restoration;
+
+    public static TechType Disruption_Web;
+
+    public static TechType Mind_Control;
+
+    public static TechType Dark_Archon_Meld;
+
+    public static TechType Feedback;
+
+    public static TechType Optical_Flare;
+
+    public static TechType Maelstrom;
+
+    public static TechType Lurker_Aspect;
+
+    public static TechType Healing;
+
+    public static TechType None;
+
+    public static TechType Nuclear_Strike;
+
+    public static TechType Unknown;
+
+
+    private static Map<Long, TechType> instances = new HashMap<Long, TechType>();
+
+    private TechType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static TechType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        TechType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new TechType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native int mineralPrice_native(long pointer);
+
+    private native int gasPrice_native(long pointer);
+
+    private native int researchTime_native(long pointer);
+
+    private native int energyCost_native(long pointer);
+
+    private native UnitType whatResearches_native(long pointer);
+
+    private native WeaponType getWeapon_native(long pointer);
+
+    private native boolean targetsUnit_native(long pointer);
+
+    private native boolean targetsPosition_native(long pointer);
+
+    private native Order getOrder_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Text/Enum.java b/generated/bwapi4/Text/Enum.java
new file mode 100644
index 0000000..8eee27e
--- /dev/null
+++ b/generated/bwapi4/Text/Enum.java
@@ -0,0 +1,49 @@
+package bwapi4.Text;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	Previous(1),
+	Default(2),
+	Yellow(3),
+	White(4),
+	Grey(5),
+	Red(6),
+	Green(7),
+	BrightRed(8),
+	Invisible(11),
+	Blue(14),
+	Teal(15),
+	Purple(16),
+	Orange(17),
+	Align_Right(18),
+	Align_Center(19),
+	Invisible2(20),
+	Brown(21),
+	PlayerWhite(22),
+	PlayerYellow(23),
+	DarkGreen(24),
+	LightYellow(25),
+	Cyan(26),
+	Tan(27),
+	GreyBlue(28),
+	GreyGreen(29),
+	GreyCyan(30);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/Text/Size/Enum.java b/generated/bwapi4/Text/Size/Enum.java
new file mode 100644
index 0000000..85e1db4
--- /dev/null
+++ b/generated/bwapi4/Text/Size/Enum.java
@@ -0,0 +1,26 @@
+package bwapi4.Text.Size;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum Enum {
+
+	Small(0),
+	Default(1),
+	Large(2);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	Enum(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/TilePosition.java b/generated/bwapi4/TilePosition.java
new file mode 100644
index 0000000..ef82a7c
--- /dev/null
+++ b/generated/bwapi4/TilePosition.java
@@ -0,0 +1,85 @@
+package bwapi4;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Build Tiles - each build tile is a 4x4 square of walk tiles, or a 32x32 square of pixels.
+ * These are called build tiles because buildability data is available at this resolution, and correspond to the tiles seen in game.
+ * For example, a Command Center occupies an area of 4x3 build tiles.
+ */
+public class TilePosition extends AbstractPoint<TilePosition>{
+    private int x, y;
+
+    public TilePosition(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public String toString() {
+        return "[" + x + ", " + y + "]";
+    }
+
+    public native boolean isValid();
+
+    public native TilePosition makeValid();
+
+    public native double getLength();
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public static TilePosition Invalid;
+
+    public static TilePosition None;
+
+    public static TilePosition Unknown;
+
+    private static Map<Long, TilePosition> instances = new HashMap<Long, TilePosition>();
+
+    private TilePosition(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static TilePosition get(long pointer) {
+        TilePosition instance = instances.get(pointer);
+        if (instance == null) {
+            instance = new TilePosition(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof TilePosition)) return false;
+
+        TilePosition that = (TilePosition) o;
+
+        if (x != that.x) return false;
+        if (y != that.y) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x;
+        result = 31 * result + y;
+        return result;
+    }
+
+    public TilePosition getPoint(){
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/Tournament/ActionID.java b/generated/bwapi4/Tournament/ActionID.java
new file mode 100644
index 0000000..a6a1c2c
--- /dev/null
+++ b/generated/bwapi4/Tournament/ActionID.java
@@ -0,0 +1,35 @@
+package bwapi4.Tournament;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public enum ActionID {
+
+	EnableFlag(0),
+	PauseGame(1),
+	ResumeGame(2),
+	LeaveGame(3),
+	SetLocalSpeed(4),
+	SetTextSize(5),
+	SetLatCom(6),
+	SetGUI(7),
+	SetMap(8),
+	SetFrameSkip(9),
+	Printf(10),
+	SendText(11);
+
+	private int value;
+
+	public int getValue(){
+		return value;
+	}
+
+	ActionID(int value){
+		this.value = value;
+	}
+
+}
diff --git a/generated/bwapi4/UnaryFilter.java b/generated/bwapi4/UnaryFilter.java
new file mode 100644
index 0000000..d3848f6
--- /dev/null
+++ b/generated/bwapi4/UnaryFilter.java
@@ -0,0 +1,34 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnaryFilter {
+
+
+    private static Map<Long, UnaryFilter> instances = new HashMap<Long, UnaryFilter>();
+
+    private UnaryFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnaryFilter get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnaryFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnaryFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi4/Unit.java b/generated/bwapi4/Unit.java
new file mode 100644
index 0000000..3cb2e35
--- /dev/null
+++ b/generated/bwapi4/Unit.java
@@ -0,0 +1,2760 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+import bwapi4.PositionedObject;
+
+public class Unit extends PositionedObject 
+{
+
+    public int getID() {
+        return getID_native(pointer);
+    }
+
+    public boolean exists() {
+        return exists_native(pointer);
+    }
+
+    public int getReplayID() {
+        return getReplayID_native(pointer);
+    }
+
+    public Player getPlayer() {
+        return getPlayer_native(pointer);
+    }
+
+    public UnitType getType() {
+        return getType_native(pointer);
+    }
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public TilePosition getTilePosition() {
+        return getTilePosition_native(pointer);
+    }
+
+    public double getAngle() {
+        return getAngle_native(pointer);
+    }
+
+    public double getVelocityX() {
+        return getVelocityX_native(pointer);
+    }
+
+    public double getVelocityY() {
+        return getVelocityY_native(pointer);
+    }
+
+    public Region getRegion() {
+        return getRegion_native(pointer);
+    }
+
+    public int getLeft() {
+        return getLeft_native(pointer);
+    }
+
+    public int getTop() {
+        return getTop_native(pointer);
+    }
+
+    public int getRight() {
+        return getRight_native(pointer);
+    }
+
+    public int getBottom() {
+        return getBottom_native(pointer);
+    }
+
+    public int getHitPoints() {
+        return getHitPoints_native(pointer);
+    }
+
+    public int getShields() {
+        return getShields_native(pointer);
+    }
+
+    public int getEnergy() {
+        return getEnergy_native(pointer);
+    }
+
+    public int getResources() {
+        return getResources_native(pointer);
+    }
+
+    public int getResourceGroup() {
+        return getResourceGroup_native(pointer);
+    }
+
+    public int getDistance(PositionOrUnit target) {
+        return getDistance_native(pointer, target);
+    }
+
+    public boolean hasPath(PositionOrUnit target) {
+        return hasPath_native(pointer, target);
+    }
+
+    public int getLastCommandFrame() {
+        return getLastCommandFrame_native(pointer);
+    }
+
+    public UnitCommand getLastCommand() {
+        return getLastCommand_native(pointer);
+    }
+
+    public Player getLastAttackingPlayer() {
+        return getLastAttackingPlayer_native(pointer);
+    }
+
+    public UnitType getInitialType() {
+        return getInitialType_native(pointer);
+    }
+
+    public Position getInitialPosition() {
+        return getInitialPosition_native(pointer);
+    }
+
+    public TilePosition getInitialTilePosition() {
+        return getInitialTilePosition_native(pointer);
+    }
+
+    public int getInitialHitPoints() {
+        return getInitialHitPoints_native(pointer);
+    }
+
+    public int getInitialResources() {
+        return getInitialResources_native(pointer);
+    }
+
+    public int getKillCount() {
+        return getKillCount_native(pointer);
+    }
+
+    public int getAcidSporeCount() {
+        return getAcidSporeCount_native(pointer);
+    }
+
+    public int getInterceptorCount() {
+        return getInterceptorCount_native(pointer);
+    }
+
+    public int getScarabCount() {
+        return getScarabCount_native(pointer);
+    }
+
+    public int getSpiderMineCount() {
+        return getSpiderMineCount_native(pointer);
+    }
+
+    public int getGroundWeaponCooldown() {
+        return getGroundWeaponCooldown_native(pointer);
+    }
+
+    public int getAirWeaponCooldown() {
+        return getAirWeaponCooldown_native(pointer);
+    }
+
+    public int getSpellCooldown() {
+        return getSpellCooldown_native(pointer);
+    }
+
+    public int getDefenseMatrixPoints() {
+        return getDefenseMatrixPoints_native(pointer);
+    }
+
+    public int getDefenseMatrixTimer() {
+        return getDefenseMatrixTimer_native(pointer);
+    }
+
+    public int getEnsnareTimer() {
+        return getEnsnareTimer_native(pointer);
+    }
+
+    public int getIrradiateTimer() {
+        return getIrradiateTimer_native(pointer);
+    }
+
+    public int getLockdownTimer() {
+        return getLockdownTimer_native(pointer);
+    }
+
+    public int getMaelstromTimer() {
+        return getMaelstromTimer_native(pointer);
+    }
+
+    public int getOrderTimer() {
+        return getOrderTimer_native(pointer);
+    }
+
+    public int getPlagueTimer() {
+        return getPlagueTimer_native(pointer);
+    }
+
+    public int getRemoveTimer() {
+        return getRemoveTimer_native(pointer);
+    }
+
+    public int getStasisTimer() {
+        return getStasisTimer_native(pointer);
+    }
+
+    public int getStimTimer() {
+        return getStimTimer_native(pointer);
+    }
+
+    public UnitType getBuildType() {
+        return getBuildType_native(pointer);
+    }
+
+    public TechType getTech() {
+        return getTech_native(pointer);
+    }
+
+    public UpgradeType getUpgrade() {
+        return getUpgrade_native(pointer);
+    }
+
+    public int getRemainingBuildTime() {
+        return getRemainingBuildTime_native(pointer);
+    }
+
+    public int getRemainingTrainTime() {
+        return getRemainingTrainTime_native(pointer);
+    }
+
+    public int getRemainingResearchTime() {
+        return getRemainingResearchTime_native(pointer);
+    }
+
+    public int getRemainingUpgradeTime() {
+        return getRemainingUpgradeTime_native(pointer);
+    }
+
+    public Unit getBuildUnit() {
+        return getBuildUnit_native(pointer);
+    }
+
+    public Unit getTarget() {
+        return getTarget_native(pointer);
+    }
+
+    public Position getTargetPosition() {
+        return getTargetPosition_native(pointer);
+    }
+
+    public Order getOrder() {
+        return getOrder_native(pointer);
+    }
+
+    public Order getSecondaryOrder() {
+        return getSecondaryOrder_native(pointer);
+    }
+
+    public Unit getOrderTarget() {
+        return getOrderTarget_native(pointer);
+    }
+
+    public Position getOrderTargetPosition() {
+        return getOrderTargetPosition_native(pointer);
+    }
+
+    public Position getRallyPosition() {
+        return getRallyPosition_native(pointer);
+    }
+
+    public Unit getRallyUnit() {
+        return getRallyUnit_native(pointer);
+    }
+
+    public Unit getAddon() {
+        return getAddon_native(pointer);
+    }
+
+    public Unit getNydusExit() {
+        return getNydusExit_native(pointer);
+    }
+
+    public Unit getPowerUp() {
+        return getPowerUp_native(pointer);
+    }
+
+    public Unit getTransport() {
+        return getTransport_native(pointer);
+    }
+
+    public List<Unit> getLoadedUnits() {
+        return getLoadedUnits_native(pointer);
+    }
+
+    public int getSpaceRemaining() {
+        return getSpaceRemaining_native(pointer);
+    }
+
+    public Unit getCarrier() {
+        return getCarrier_native(pointer);
+    }
+
+    public List<Unit> getInterceptors() {
+        return getInterceptors_native(pointer);
+    }
+
+    public Unit getHatchery() {
+        return getHatchery_native(pointer);
+    }
+
+    public List<Unit> getLarva() {
+        return getLarva_native(pointer);
+    }
+
+    public boolean hasNuke() {
+        return hasNuke_native(pointer);
+    }
+
+    public boolean isAccelerating() {
+        return isAccelerating_native(pointer);
+    }
+
+    public boolean isAttacking() {
+        return isAttacking_native(pointer);
+    }
+
+    public boolean isAttackFrame() {
+        return isAttackFrame_native(pointer);
+    }
+
+    public boolean isBeingConstructed() {
+        return isBeingConstructed_native(pointer);
+    }
+
+    public boolean isBeingGathered() {
+        return isBeingGathered_native(pointer);
+    }
+
+    public boolean isBeingHealed() {
+        return isBeingHealed_native(pointer);
+    }
+
+    public boolean isBlind() {
+        return isBlind_native(pointer);
+    }
+
+    public boolean isBraking() {
+        return isBraking_native(pointer);
+    }
+
+    public boolean isBurrowed() {
+        return isBurrowed_native(pointer);
+    }
+
+    public boolean isCarryingGas() {
+        return isCarryingGas_native(pointer);
+    }
+
+    public boolean isCarryingMinerals() {
+        return isCarryingMinerals_native(pointer);
+    }
+
+    public boolean isCloaked() {
+        return isCloaked_native(pointer);
+    }
+
+    public boolean isCompleted() {
+        return isCompleted_native(pointer);
+    }
+
+    public boolean isConstructing() {
+        return isConstructing_native(pointer);
+    }
+
+    public boolean isDefenseMatrixed() {
+        return isDefenseMatrixed_native(pointer);
+    }
+
+    public boolean isDetected() {
+        return isDetected_native(pointer);
+    }
+
+    public boolean isEnsnared() {
+        return isEnsnared_native(pointer);
+    }
+
+    public boolean isFlying() {
+        return isFlying_native(pointer);
+    }
+
+    public boolean isFollowing() {
+        return isFollowing_native(pointer);
+    }
+
+    public boolean isGatheringGas() {
+        return isGatheringGas_native(pointer);
+    }
+
+    public boolean isGatheringMinerals() {
+        return isGatheringMinerals_native(pointer);
+    }
+
+    public boolean isHallucination() {
+        return isHallucination_native(pointer);
+    }
+
+    public boolean isHoldingPosition() {
+        return isHoldingPosition_native(pointer);
+    }
+
+    public boolean isIdle() {
+        return isIdle_native(pointer);
+    }
+
+    public boolean isInterruptible() {
+        return isInterruptible_native(pointer);
+    }
+
+    public boolean isInvincible() {
+        return isInvincible_native(pointer);
+    }
+
+    public boolean isInWeaponRange(Unit target) {
+        return isInWeaponRange_native(pointer, target);
+    }
+
+    public boolean isIrradiated() {
+        return isIrradiated_native(pointer);
+    }
+
+    public boolean isLifted() {
+        return isLifted_native(pointer);
+    }
+
+    public boolean isLoaded() {
+        return isLoaded_native(pointer);
+    }
+
+    public boolean isLockedDown() {
+        return isLockedDown_native(pointer);
+    }
+
+    public boolean isMaelstrommed() {
+        return isMaelstrommed_native(pointer);
+    }
+
+    public boolean isMorphing() {
+        return isMorphing_native(pointer);
+    }
+
+    public boolean isMoving() {
+        return isMoving_native(pointer);
+    }
+
+    public boolean isParasited() {
+        return isParasited_native(pointer);
+    }
+
+    public boolean isPatrolling() {
+        return isPatrolling_native(pointer);
+    }
+
+    public boolean isPlagued() {
+        return isPlagued_native(pointer);
+    }
+
+    public boolean isRepairing() {
+        return isRepairing_native(pointer);
+    }
+
+    public boolean isResearching() {
+        return isResearching_native(pointer);
+    }
+
+    public boolean isSelected() {
+        return isSelected_native(pointer);
+    }
+
+    public boolean isSieged() {
+        return isSieged_native(pointer);
+    }
+
+    public boolean isStartingAttack() {
+        return isStartingAttack_native(pointer);
+    }
+
+    public boolean isStasised() {
+        return isStasised_native(pointer);
+    }
+
+    public boolean isStimmed() {
+        return isStimmed_native(pointer);
+    }
+
+    public boolean isStuck() {
+        return isStuck_native(pointer);
+    }
+
+    public boolean isTraining() {
+        return isTraining_native(pointer);
+    }
+
+    public boolean isUnderAttack() {
+        return isUnderAttack_native(pointer);
+    }
+
+    public boolean isUnderDarkSwarm() {
+        return isUnderDarkSwarm_native(pointer);
+    }
+
+    public boolean isUnderDisruptionWeb() {
+        return isUnderDisruptionWeb_native(pointer);
+    }
+
+    public boolean isUnderStorm() {
+        return isUnderStorm_native(pointer);
+    }
+
+    public boolean isPowered() {
+        return isPowered_native(pointer);
+    }
+
+    public boolean isUpgrading() {
+        return isUpgrading_native(pointer);
+    }
+
+    public boolean isVisible() {
+        return isVisible_native(pointer);
+    }
+
+    public boolean isVisible(Player player) {
+        return isVisible_native(pointer, player);
+    }
+
+    public boolean isTargetable() {
+        return isTargetable_native(pointer);
+    }
+
+    public boolean issueCommand(UnitCommand command) {
+        return issueCommand_native(pointer, command);
+    }
+
+    public boolean attack(PositionOrUnit target) {
+        return attack_native(pointer, target);
+    }
+
+    public boolean attack(PositionOrUnit target, boolean shiftQueueCommand) {
+        return attack_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean build(UnitType type) {
+        return build_native(pointer, type);
+    }
+
+    public boolean build(UnitType type, TilePosition target) {
+        return build_native(pointer, type, target);
+    }
+
+    public boolean buildAddon(UnitType type) {
+        return buildAddon_native(pointer, type);
+    }
+
+    public boolean train() {
+        return train_native(pointer);
+    }
+
+    public boolean train(UnitType type) {
+        return train_native(pointer, type);
+    }
+
+    public boolean morph(UnitType type) {
+        return morph_native(pointer, type);
+    }
+
+    public boolean research(TechType tech) {
+        return research_native(pointer, tech);
+    }
+
+    public boolean upgrade(UpgradeType upgrade) {
+        return upgrade_native(pointer, upgrade);
+    }
+
+    public boolean setRallyPoint(PositionOrUnit target) {
+        return setRallyPoint_native(pointer, target);
+    }
+
+    public boolean move(Position target) {
+        return move_native(pointer, target);
+    }
+
+    public boolean move(Position target, boolean shiftQueueCommand) {
+        return move_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean patrol(Position target) {
+        return patrol_native(pointer, target);
+    }
+
+    public boolean patrol(Position target, boolean shiftQueueCommand) {
+        return patrol_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean holdPosition() {
+        return holdPosition_native(pointer);
+    }
+
+    public boolean holdPosition(boolean shiftQueueCommand) {
+        return holdPosition_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean stop() {
+        return stop_native(pointer);
+    }
+
+    public boolean stop(boolean shiftQueueCommand) {
+        return stop_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean follow(Unit target) {
+        return follow_native(pointer, target);
+    }
+
+    public boolean follow(Unit target, boolean shiftQueueCommand) {
+        return follow_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean gather(Unit target) {
+        return gather_native(pointer, target);
+    }
+
+    public boolean gather(Unit target, boolean shiftQueueCommand) {
+        return gather_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean returnCargo() {
+        return returnCargo_native(pointer);
+    }
+
+    public boolean returnCargo(boolean shiftQueueCommand) {
+        return returnCargo_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean repair(Unit target) {
+        return repair_native(pointer, target);
+    }
+
+    public boolean repair(Unit target, boolean shiftQueueCommand) {
+        return repair_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean burrow() {
+        return burrow_native(pointer);
+    }
+
+    public boolean unburrow() {
+        return unburrow_native(pointer);
+    }
+
+    public boolean cloak() {
+        return cloak_native(pointer);
+    }
+
+    public boolean decloak() {
+        return decloak_native(pointer);
+    }
+
+    public boolean siege() {
+        return siege_native(pointer);
+    }
+
+    public boolean unsiege() {
+        return unsiege_native(pointer);
+    }
+
+    public boolean lift() {
+        return lift_native(pointer);
+    }
+
+    public boolean land(TilePosition target) {
+        return land_native(pointer, target);
+    }
+
+    public boolean load(Unit target) {
+        return load_native(pointer, target);
+    }
+
+    public boolean load(Unit target, boolean shiftQueueCommand) {
+        return load_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean unload(Unit target) {
+        return unload_native(pointer, target);
+    }
+
+    public boolean unloadAll() {
+        return unloadAll_native(pointer);
+    }
+
+    public boolean unloadAll(boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean unloadAll(Position target) {
+        return unloadAll_native(pointer, target);
+    }
+
+    public boolean unloadAll(Position target, boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean rightClick(PositionOrUnit target) {
+        return rightClick_native(pointer, target);
+    }
+
+    public boolean rightClick(PositionOrUnit target, boolean shiftQueueCommand) {
+        return rightClick_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean haltConstruction() {
+        return haltConstruction_native(pointer);
+    }
+
+    public boolean cancelConstruction() {
+        return cancelConstruction_native(pointer);
+    }
+
+    public boolean cancelAddon() {
+        return cancelAddon_native(pointer);
+    }
+
+    public boolean cancelTrain() {
+        return cancelTrain_native(pointer);
+    }
+
+    public boolean cancelTrain(int slot) {
+        return cancelTrain_native(pointer, slot);
+    }
+
+    public boolean cancelMorph() {
+        return cancelMorph_native(pointer);
+    }
+
+    public boolean cancelResearch() {
+        return cancelResearch_native(pointer);
+    }
+
+    public boolean cancelUpgrade() {
+        return cancelUpgrade_native(pointer);
+    }
+
+    public boolean useTech(TechType tech) {
+        return useTech_native(pointer, tech);
+    }
+
+    public boolean useTech(TechType tech, PositionOrUnit target) {
+        return useTech_native(pointer, tech, target);
+    }
+
+    public boolean placeCOP(TilePosition target) {
+        return placeCOP_native(pointer, target);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType, checkCanTargetUnit);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions);
+    }
+
+    public boolean canIssueCommand(UnitCommand command) {
+        return canIssueCommand_native(pointer, command);
+    }
+
+    public boolean canIssueCommand(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canIssueCommand_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanBuildUnitType, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command) {
+        return canIssueCommandGrouped_native(pointer, command);
+    }
+
+    public boolean canIssueCommandGrouped(UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canIssueCommandGrouped_native(pointer, command, checkCanUseTechPositionOnPositions, checkCanUseTechUnitOnUnits, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canCommand() {
+        return canCommand_native(pointer);
+    }
+
+    public boolean canCommandGrouped() {
+        return canCommandGrouped_native(pointer);
+    }
+
+    public boolean canCommandGrouped(boolean checkCommandibility) {
+        return canCommandGrouped_native(pointer, checkCommandibility);
+    }
+
+    public boolean canIssueCommandType(UnitCommandType ct) {
+        return canIssueCommandType_native(pointer, ct);
+    }
+
+    public boolean canIssueCommandType(UnitCommandType ct, boolean checkCommandibility) {
+        return canIssueCommandType_native(pointer, ct, checkCommandibility);
+    }
+
+    public boolean canIssueCommandTypeGrouped(UnitCommandType ct, boolean checkCommandibilityGrouped) {
+        return canIssueCommandTypeGrouped_native(pointer, ct, checkCommandibilityGrouped);
+    }
+
+    public boolean canIssueCommandTypeGrouped(UnitCommandType ct) {
+        return canIssueCommandTypeGrouped_native(pointer, ct);
+    }
+
+    public boolean canIssueCommandTypeGrouped(UnitCommandType ct, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canIssueCommandTypeGrouped_native(pointer, ct, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canTargetUnit(Unit targetUnit) {
+        return canTargetUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canTargetUnit(Unit targetUnit, boolean checkCommandibility) {
+        return canTargetUnit_native(pointer, targetUnit, checkCommandibility);
+    }
+
+    public boolean canAttack() {
+        return canAttack_native(pointer);
+    }
+
+    public boolean canAttack(boolean checkCommandibility) {
+        return canAttack_native(pointer, checkCommandibility);
+    }
+
+    public boolean canAttack(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttack_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttack(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canAttack_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canAttack(PositionOrUnit target) {
+        return canAttack_native(pointer, target);
+    }
+
+    public boolean canAttack(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canAttack_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canAttackGrouped(boolean checkCommandibilityGrouped) {
+        return canAttackGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackGrouped() {
+        return canAttackGrouped_native(pointer);
+    }
+
+    public boolean canAttackGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target) {
+        return canAttackGrouped_native(pointer, target);
+    }
+
+    public boolean canAttackGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackMove() {
+        return canAttackMove_native(pointer);
+    }
+
+    public boolean canAttackMove(boolean checkCommandibility) {
+        return canAttackMove_native(pointer, checkCommandibility);
+    }
+
+    public boolean canAttackMoveGrouped(boolean checkCommandibilityGrouped) {
+        return canAttackMoveGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackMoveGrouped() {
+        return canAttackMoveGrouped_native(pointer);
+    }
+
+    public boolean canAttackMoveGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackMoveGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackUnit() {
+        return canAttackUnit_native(pointer);
+    }
+
+    public boolean canAttackUnit(boolean checkCommandibility) {
+        return canAttackUnit_native(pointer, checkCommandibility);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttackUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canAttackUnit_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit) {
+        return canAttackUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canAttackUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canAttackUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canAttackUnitGrouped(boolean checkCommandibilityGrouped) {
+        return canAttackUnitGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackUnitGrouped() {
+        return canAttackUnitGrouped_native(pointer);
+    }
+
+    public boolean canAttackUnitGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackUnitGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit) {
+        return canAttackUnitGrouped_native(pointer, targetUnit);
+    }
+
+    public boolean canAttackUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canAttackUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canBuild() {
+        return canBuild_native(pointer);
+    }
+
+    public boolean canBuild(boolean checkCommandibility) {
+        return canBuild_native(pointer, checkCommandibility);
+    }
+
+    public boolean canBuild(UnitType uType, boolean checkCanIssueCommandType) {
+        return canBuild_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canBuild(UnitType uType) {
+        return canBuild_native(pointer, uType);
+    }
+
+    public boolean canBuild(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canBuild_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType) {
+        return canBuild_native(pointer, uType, tilePos, checkTargetUnitType, checkCanIssueCommandType);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos, boolean checkTargetUnitType) {
+        return canBuild_native(pointer, uType, tilePos, checkTargetUnitType);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos) {
+        return canBuild_native(pointer, uType, tilePos);
+    }
+
+    public boolean canBuild(UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canBuild_native(pointer, uType, tilePos, checkTargetUnitType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canBuildAddon() {
+        return canBuildAddon_native(pointer);
+    }
+
+    public boolean canBuildAddon(boolean checkCommandibility) {
+        return canBuildAddon_native(pointer, checkCommandibility);
+    }
+
+    public boolean canBuildAddon(UnitType uType, boolean checkCanIssueCommandType) {
+        return canBuildAddon_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canBuildAddon(UnitType uType) {
+        return canBuildAddon_native(pointer, uType);
+    }
+
+    public boolean canBuildAddon(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canBuildAddon_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canTrain() {
+        return canTrain_native(pointer);
+    }
+
+    public boolean canTrain(boolean checkCommandibility) {
+        return canTrain_native(pointer, checkCommandibility);
+    }
+
+    public boolean canTrain(UnitType uType, boolean checkCanIssueCommandType) {
+        return canTrain_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canTrain(UnitType uType) {
+        return canTrain_native(pointer, uType);
+    }
+
+    public boolean canTrain(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canTrain_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canMorph() {
+        return canMorph_native(pointer);
+    }
+
+    public boolean canMorph(boolean checkCommandibility) {
+        return canMorph_native(pointer, checkCommandibility);
+    }
+
+    public boolean canMorph(UnitType uType, boolean checkCanIssueCommandType) {
+        return canMorph_native(pointer, uType, checkCanIssueCommandType);
+    }
+
+    public boolean canMorph(UnitType uType) {
+        return canMorph_native(pointer, uType);
+    }
+
+    public boolean canMorph(UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canMorph_native(pointer, uType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canResearch() {
+        return canResearch_native(pointer);
+    }
+
+    public boolean canResearch(boolean checkCommandibility) {
+        return canResearch_native(pointer, checkCommandibility);
+    }
+
+    public boolean canResearch(TechType type) {
+        return canResearch_native(pointer, type);
+    }
+
+    public boolean canResearch(TechType type, boolean checkCanIssueCommandType) {
+        return canResearch_native(pointer, type, checkCanIssueCommandType);
+    }
+
+    public boolean canUpgrade() {
+        return canUpgrade_native(pointer);
+    }
+
+    public boolean canUpgrade(boolean checkCommandibility) {
+        return canUpgrade_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUpgrade(UpgradeType type) {
+        return canUpgrade_native(pointer, type);
+    }
+
+    public boolean canUpgrade(UpgradeType type, boolean checkCanIssueCommandType) {
+        return canUpgrade_native(pointer, type, checkCanIssueCommandType);
+    }
+
+    public boolean canSetRallyPoint() {
+        return canSetRallyPoint_native(pointer);
+    }
+
+    public boolean canSetRallyPoint(boolean checkCommandibility) {
+        return canSetRallyPoint_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canSetRallyPoint_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canSetRallyPoint_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target) {
+        return canSetRallyPoint_native(pointer, target);
+    }
+
+    public boolean canSetRallyPoint(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canSetRallyPoint_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canSetRallyPosition() {
+        return canSetRallyPosition_native(pointer);
+    }
+
+    public boolean canSetRallyPosition(boolean checkCommandibility) {
+        return canSetRallyPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSetRallyUnit() {
+        return canSetRallyUnit_native(pointer);
+    }
+
+    public boolean canSetRallyUnit(boolean checkCommandibility) {
+        return canSetRallyUnit_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canSetRallyUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canSetRallyUnit_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit) {
+        return canSetRallyUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canSetRallyUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canSetRallyUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canMove() {
+        return canMove_native(pointer);
+    }
+
+    public boolean canMove(boolean checkCommandibility) {
+        return canMove_native(pointer, checkCommandibility);
+    }
+
+    public boolean canMoveGrouped(boolean checkCommandibilityGrouped) {
+        return canMoveGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canMoveGrouped() {
+        return canMoveGrouped_native(pointer);
+    }
+
+    public boolean canMoveGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canMoveGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canPatrol() {
+        return canPatrol_native(pointer);
+    }
+
+    public boolean canPatrol(boolean checkCommandibility) {
+        return canPatrol_native(pointer, checkCommandibility);
+    }
+
+    public boolean canPatrolGrouped(boolean checkCommandibilityGrouped) {
+        return canPatrolGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canPatrolGrouped() {
+        return canPatrolGrouped_native(pointer);
+    }
+
+    public boolean canPatrolGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canPatrolGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canFollow() {
+        return canFollow_native(pointer);
+    }
+
+    public boolean canFollow(boolean checkCommandibility) {
+        return canFollow_native(pointer, checkCommandibility);
+    }
+
+    public boolean canFollow(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canFollow_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canFollow(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canFollow_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canFollow(Unit targetUnit) {
+        return canFollow_native(pointer, targetUnit);
+    }
+
+    public boolean canFollow(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canFollow_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canGather() {
+        return canGather_native(pointer);
+    }
+
+    public boolean canGather(boolean checkCommandibility) {
+        return canGather_native(pointer, checkCommandibility);
+    }
+
+    public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canGather_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canGather_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canGather(Unit targetUnit) {
+        return canGather_native(pointer, targetUnit);
+    }
+
+    public boolean canGather(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canGather_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canReturnCargo() {
+        return canReturnCargo_native(pointer);
+    }
+
+    public boolean canReturnCargo(boolean checkCommandibility) {
+        return canReturnCargo_native(pointer, checkCommandibility);
+    }
+
+    public boolean canHoldPosition() {
+        return canHoldPosition_native(pointer);
+    }
+
+    public boolean canHoldPosition(boolean checkCommandibility) {
+        return canHoldPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canStop() {
+        return canStop_native(pointer);
+    }
+
+    public boolean canStop(boolean checkCommandibility) {
+        return canStop_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRepair() {
+        return canRepair_native(pointer);
+    }
+
+    public boolean canRepair(boolean checkCommandibility) {
+        return canRepair_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRepair(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRepair_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRepair(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canRepair_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canRepair(Unit targetUnit) {
+        return canRepair_native(pointer, targetUnit);
+    }
+
+    public boolean canRepair(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canRepair_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canBurrow() {
+        return canBurrow_native(pointer);
+    }
+
+    public boolean canBurrow(boolean checkCommandibility) {
+        return canBurrow_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnburrow() {
+        return canUnburrow_native(pointer);
+    }
+
+    public boolean canUnburrow(boolean checkCommandibility) {
+        return canUnburrow_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCloak() {
+        return canCloak_native(pointer);
+    }
+
+    public boolean canCloak(boolean checkCommandibility) {
+        return canCloak_native(pointer, checkCommandibility);
+    }
+
+    public boolean canDecloak() {
+        return canDecloak_native(pointer);
+    }
+
+    public boolean canDecloak(boolean checkCommandibility) {
+        return canDecloak_native(pointer, checkCommandibility);
+    }
+
+    public boolean canSiege() {
+        return canSiege_native(pointer);
+    }
+
+    public boolean canSiege(boolean checkCommandibility) {
+        return canSiege_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnsiege() {
+        return canUnsiege_native(pointer);
+    }
+
+    public boolean canUnsiege(boolean checkCommandibility) {
+        return canUnsiege_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLift() {
+        return canLift_native(pointer);
+    }
+
+    public boolean canLift(boolean checkCommandibility) {
+        return canLift_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLand() {
+        return canLand_native(pointer);
+    }
+
+    public boolean canLand(boolean checkCommandibility) {
+        return canLand_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLand(TilePosition target, boolean checkCanIssueCommandType) {
+        return canLand_native(pointer, target, checkCanIssueCommandType);
+    }
+
+    public boolean canLand(TilePosition target) {
+        return canLand_native(pointer, target);
+    }
+
+    public boolean canLand(TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canLand_native(pointer, target, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canLoad() {
+        return canLoad_native(pointer);
+    }
+
+    public boolean canLoad(boolean checkCommandibility) {
+        return canLoad_native(pointer, checkCommandibility);
+    }
+
+    public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canLoad_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canLoad_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canLoad(Unit targetUnit) {
+        return canLoad_native(pointer, targetUnit);
+    }
+
+    public boolean canLoad(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canLoad_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUnloadWithOrWithoutTarget() {
+        return canUnloadWithOrWithoutTarget_native(pointer);
+    }
+
+    public boolean canUnloadWithOrWithoutTarget(boolean checkCommandibility) {
+        return canUnloadWithOrWithoutTarget_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnloadAtPosition(Position targDropPos, boolean checkCanIssueCommandType) {
+        return canUnloadAtPosition_native(pointer, targDropPos, checkCanIssueCommandType);
+    }
+
+    public boolean canUnloadAtPosition(Position targDropPos) {
+        return canUnloadAtPosition_native(pointer, targDropPos);
+    }
+
+    public boolean canUnloadAtPosition(Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUnloadAtPosition_native(pointer, targDropPos, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUnload() {
+        return canUnload_native(pointer);
+    }
+
+    public boolean canUnload(boolean checkCommandibility) {
+        return canUnload_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit, checkPosition, checkCanIssueCommandType);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit, checkPosition);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canUnload(Unit targetUnit) {
+        return canUnload_native(pointer, targetUnit);
+    }
+
+    public boolean canUnload(Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUnload_native(pointer, targetUnit, checkCanTargetUnit, checkPosition, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUnloadAll() {
+        return canUnloadAll_native(pointer);
+    }
+
+    public boolean canUnloadAll(boolean checkCommandibility) {
+        return canUnloadAll_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnloadAllPosition() {
+        return canUnloadAllPosition_native(pointer);
+    }
+
+    public boolean canUnloadAllPosition(boolean checkCommandibility) {
+        return canUnloadAllPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUnloadAllPosition(Position targDropPos, boolean checkCanIssueCommandType) {
+        return canUnloadAllPosition_native(pointer, targDropPos, checkCanIssueCommandType);
+    }
+
+    public boolean canUnloadAllPosition(Position targDropPos) {
+        return canUnloadAllPosition_native(pointer, targDropPos);
+    }
+
+    public boolean canUnloadAllPosition(Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUnloadAllPosition_native(pointer, targDropPos, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canRightClick() {
+        return canRightClick_native(pointer);
+    }
+
+    public boolean canRightClick(boolean checkCommandibility) {
+        return canRightClick_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRightClick(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClick_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClick(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canRightClick_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canRightClick(PositionOrUnit target) {
+        return canRightClick_native(pointer, target);
+    }
+
+    public boolean canRightClick(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canRightClick_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canRightClickGrouped(boolean checkCommandibilityGrouped) {
+        return canRightClickGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickGrouped() {
+        return canRightClickGrouped_native(pointer);
+    }
+
+    public boolean canRightClickGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target) {
+        return canRightClickGrouped_native(pointer, target);
+    }
+
+    public boolean canRightClickGrouped(PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickGrouped_native(pointer, target, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickPosition() {
+        return canRightClickPosition_native(pointer);
+    }
+
+    public boolean canRightClickPosition(boolean checkCommandibility) {
+        return canRightClickPosition_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRightClickPositionGrouped(boolean checkCommandibilityGrouped) {
+        return canRightClickPositionGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickPositionGrouped() {
+        return canRightClickPositionGrouped_native(pointer);
+    }
+
+    public boolean canRightClickPositionGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickPositionGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickUnit() {
+        return canRightClickUnit_native(pointer);
+    }
+
+    public boolean canRightClickUnit(boolean checkCommandibility) {
+        return canRightClickUnit_native(pointer, checkCommandibility);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClickUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canRightClickUnit_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit) {
+        return canRightClickUnit_native(pointer, targetUnit);
+    }
+
+    public boolean canRightClickUnit(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canRightClickUnit_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canRightClickUnitGrouped(boolean checkCommandibilityGrouped) {
+        return canRightClickUnitGrouped_native(pointer, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickUnitGrouped() {
+        return canRightClickUnitGrouped_native(pointer);
+    }
+
+    public boolean canRightClickUnitGrouped(boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickUnitGrouped_native(pointer, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit);
+    }
+
+    public boolean canRightClickUnitGrouped(Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility) {
+        return canRightClickUnitGrouped_native(pointer, targetUnit, checkCanTargetUnit, checkCanIssueCommandType, checkCommandibilityGrouped, checkCommandibility);
+    }
+
+    public boolean canHaltConstruction() {
+        return canHaltConstruction_native(pointer);
+    }
+
+    public boolean canHaltConstruction(boolean checkCommandibility) {
+        return canHaltConstruction_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelConstruction() {
+        return canCancelConstruction_native(pointer);
+    }
+
+    public boolean canCancelConstruction(boolean checkCommandibility) {
+        return canCancelConstruction_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelAddon() {
+        return canCancelAddon_native(pointer);
+    }
+
+    public boolean canCancelAddon(boolean checkCommandibility) {
+        return canCancelAddon_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelTrain() {
+        return canCancelTrain_native(pointer);
+    }
+
+    public boolean canCancelTrain(boolean checkCommandibility) {
+        return canCancelTrain_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelTrainSlot() {
+        return canCancelTrainSlot_native(pointer);
+    }
+
+    public boolean canCancelTrainSlot(boolean checkCommandibility) {
+        return canCancelTrainSlot_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelTrainSlot(int slot, boolean checkCanIssueCommandType) {
+        return canCancelTrainSlot_native(pointer, slot, checkCanIssueCommandType);
+    }
+
+    public boolean canCancelTrainSlot(int slot) {
+        return canCancelTrainSlot_native(pointer, slot);
+    }
+
+    public boolean canCancelTrainSlot(int slot, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canCancelTrainSlot_native(pointer, slot, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canCancelMorph() {
+        return canCancelMorph_native(pointer);
+    }
+
+    public boolean canCancelMorph(boolean checkCommandibility) {
+        return canCancelMorph_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelResearch() {
+        return canCancelResearch_native(pointer);
+    }
+
+    public boolean canCancelResearch(boolean checkCommandibility) {
+        return canCancelResearch_native(pointer, checkCommandibility);
+    }
+
+    public boolean canCancelUpgrade() {
+        return canCancelUpgrade_native(pointer);
+    }
+
+    public boolean canCancelUpgrade(boolean checkCommandibility) {
+        return canCancelUpgrade_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget() {
+        return canUseTechWithOrWithoutTarget_native(pointer);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(boolean checkCommandibility) {
+        return canUseTechWithOrWithoutTarget_native(pointer, checkCommandibility);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechWithOrWithoutTarget_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(TechType tech) {
+        return canUseTechWithOrWithoutTarget_native(pointer, tech);
+    }
+
+    public boolean canUseTechWithOrWithoutTarget(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechWithOrWithoutTarget_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit, checkTargetsType, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit, checkTargetsType);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target) {
+        return canUseTech_native(pointer, tech, target);
+    }
+
+    public boolean canUseTech(TechType tech) {
+        return canUseTech_native(pointer, tech);
+    }
+
+    public boolean canUseTech(TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTech_native(pointer, tech, target, checkCanTargetUnit, checkTargetsType, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechWithoutTarget(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechWithoutTarget_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechWithoutTarget(TechType tech) {
+        return canUseTechWithoutTarget_native(pointer, tech);
+    }
+
+    public boolean canUseTechWithoutTarget(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechWithoutTarget_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechUnit(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechUnit_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechUnit(TechType tech) {
+        return canUseTechUnit_native(pointer, tech);
+    }
+
+    public boolean canUseTechUnit(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechUnit_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit, checkTargetsUnits, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit, checkTargetsUnits);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit) {
+        return canUseTechUnit_native(pointer, tech, targetUnit);
+    }
+
+    public boolean canUseTechUnit(TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechUnit_native(pointer, tech, targetUnit, checkCanTargetUnit, checkTargetsUnits, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechPosition(TechType tech, boolean checkCanIssueCommandType) {
+        return canUseTechPosition_native(pointer, tech, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechPosition(TechType tech) {
+        return canUseTechPosition_native(pointer, tech);
+    }
+
+    public boolean canUseTechPosition(TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechPosition_native(pointer, tech, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType) {
+        return canUseTechPosition_native(pointer, tech, target, checkTargetsPositions, checkCanIssueCommandType);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target, boolean checkTargetsPositions) {
+        return canUseTechPosition_native(pointer, tech, target, checkTargetsPositions);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target) {
+        return canUseTechPosition_native(pointer, tech, target);
+    }
+
+    public boolean canUseTechPosition(TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canUseTechPosition_native(pointer, tech, target, checkTargetsPositions, checkCanIssueCommandType, checkCommandibility);
+    }
+
+    public boolean canPlaceCOP() {
+        return canPlaceCOP_native(pointer);
+    }
+
+    public boolean canPlaceCOP(boolean checkCommandibility) {
+        return canPlaceCOP_native(pointer, checkCommandibility);
+    }
+
+    public boolean canPlaceCOP(TilePosition target, boolean checkCanIssueCommandType) {
+        return canPlaceCOP_native(pointer, target, checkCanIssueCommandType);
+    }
+
+    public boolean canPlaceCOP(TilePosition target) {
+        return canPlaceCOP_native(pointer, target);
+    }
+
+    public boolean canPlaceCOP(TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility) {
+        return canPlaceCOP_native(pointer, target, checkCanIssueCommandType, checkCommandibility);
+    }
+
+
+    private static Map<Long, Unit> instances = new HashMap<Long, Unit>();
+
+    private Unit(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Unit get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Unit instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Unit(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native int getID_native(long pointer);
+
+    private native boolean exists_native(long pointer);
+
+    private native int getReplayID_native(long pointer);
+
+    private native Player getPlayer_native(long pointer);
+
+    private native UnitType getType_native(long pointer);
+
+    private native Position getPosition_native(long pointer);
+
+    private native TilePosition getTilePosition_native(long pointer);
+
+    private native double getAngle_native(long pointer);
+
+    private native double getVelocityX_native(long pointer);
+
+    private native double getVelocityY_native(long pointer);
+
+    private native Region getRegion_native(long pointer);
+
+    private native int getLeft_native(long pointer);
+
+    private native int getTop_native(long pointer);
+
+    private native int getRight_native(long pointer);
+
+    private native int getBottom_native(long pointer);
+
+    private native int getHitPoints_native(long pointer);
+
+    private native int getShields_native(long pointer);
+
+    private native int getEnergy_native(long pointer);
+
+    private native int getResources_native(long pointer);
+
+    private native int getResourceGroup_native(long pointer);
+
+    private native int getDistance_native(long pointer, PositionOrUnit target);
+
+    private native boolean hasPath_native(long pointer, PositionOrUnit target);
+
+    private native int getLastCommandFrame_native(long pointer);
+
+    private native UnitCommand getLastCommand_native(long pointer);
+
+    private native Player getLastAttackingPlayer_native(long pointer);
+
+    private native UnitType getInitialType_native(long pointer);
+
+    private native Position getInitialPosition_native(long pointer);
+
+    private native TilePosition getInitialTilePosition_native(long pointer);
+
+    private native int getInitialHitPoints_native(long pointer);
+
+    private native int getInitialResources_native(long pointer);
+
+    private native int getKillCount_native(long pointer);
+
+    private native int getAcidSporeCount_native(long pointer);
+
+    private native int getInterceptorCount_native(long pointer);
+
+    private native int getScarabCount_native(long pointer);
+
+    private native int getSpiderMineCount_native(long pointer);
+
+    private native int getGroundWeaponCooldown_native(long pointer);
+
+    private native int getAirWeaponCooldown_native(long pointer);
+
+    private native int getSpellCooldown_native(long pointer);
+
+    private native int getDefenseMatrixPoints_native(long pointer);
+
+    private native int getDefenseMatrixTimer_native(long pointer);
+
+    private native int getEnsnareTimer_native(long pointer);
+
+    private native int getIrradiateTimer_native(long pointer);
+
+    private native int getLockdownTimer_native(long pointer);
+
+    private native int getMaelstromTimer_native(long pointer);
+
+    private native int getOrderTimer_native(long pointer);
+
+    private native int getPlagueTimer_native(long pointer);
+
+    private native int getRemoveTimer_native(long pointer);
+
+    private native int getStasisTimer_native(long pointer);
+
+    private native int getStimTimer_native(long pointer);
+
+    private native UnitType getBuildType_native(long pointer);
+
+    private native TechType getTech_native(long pointer);
+
+    private native UpgradeType getUpgrade_native(long pointer);
+
+    private native int getRemainingBuildTime_native(long pointer);
+
+    private native int getRemainingTrainTime_native(long pointer);
+
+    private native int getRemainingResearchTime_native(long pointer);
+
+    private native int getRemainingUpgradeTime_native(long pointer);
+
+    private native Unit getBuildUnit_native(long pointer);
+
+    private native Unit getTarget_native(long pointer);
+
+    private native Position getTargetPosition_native(long pointer);
+
+    private native Order getOrder_native(long pointer);
+
+    private native Order getSecondaryOrder_native(long pointer);
+
+    private native Unit getOrderTarget_native(long pointer);
+
+    private native Position getOrderTargetPosition_native(long pointer);
+
+    private native Position getRallyPosition_native(long pointer);
+
+    private native Unit getRallyUnit_native(long pointer);
+
+    private native Unit getAddon_native(long pointer);
+
+    private native Unit getNydusExit_native(long pointer);
+
+    private native Unit getPowerUp_native(long pointer);
+
+    private native Unit getTransport_native(long pointer);
+
+    private native List<Unit> getLoadedUnits_native(long pointer);
+
+    private native int getSpaceRemaining_native(long pointer);
+
+    private native Unit getCarrier_native(long pointer);
+
+    private native List<Unit> getInterceptors_native(long pointer);
+
+    private native Unit getHatchery_native(long pointer);
+
+    private native List<Unit> getLarva_native(long pointer);
+
+    private native boolean hasNuke_native(long pointer);
+
+    private native boolean isAccelerating_native(long pointer);
+
+    private native boolean isAttacking_native(long pointer);
+
+    private native boolean isAttackFrame_native(long pointer);
+
+    private native boolean isBeingConstructed_native(long pointer);
+
+    private native boolean isBeingGathered_native(long pointer);
+
+    private native boolean isBeingHealed_native(long pointer);
+
+    private native boolean isBlind_native(long pointer);
+
+    private native boolean isBraking_native(long pointer);
+
+    private native boolean isBurrowed_native(long pointer);
+
+    private native boolean isCarryingGas_native(long pointer);
+
+    private native boolean isCarryingMinerals_native(long pointer);
+
+    private native boolean isCloaked_native(long pointer);
+
+    private native boolean isCompleted_native(long pointer);
+
+    private native boolean isConstructing_native(long pointer);
+
+    private native boolean isDefenseMatrixed_native(long pointer);
+
+    private native boolean isDetected_native(long pointer);
+
+    private native boolean isEnsnared_native(long pointer);
+
+    private native boolean isFlying_native(long pointer);
+
+    private native boolean isFollowing_native(long pointer);
+
+    private native boolean isGatheringGas_native(long pointer);
+
+    private native boolean isGatheringMinerals_native(long pointer);
+
+    private native boolean isHallucination_native(long pointer);
+
+    private native boolean isHoldingPosition_native(long pointer);
+
+    private native boolean isIdle_native(long pointer);
+
+    private native boolean isInterruptible_native(long pointer);
+
+    private native boolean isInvincible_native(long pointer);
+
+    private native boolean isInWeaponRange_native(long pointer, Unit target);
+
+    private native boolean isIrradiated_native(long pointer);
+
+    private native boolean isLifted_native(long pointer);
+
+    private native boolean isLoaded_native(long pointer);
+
+    private native boolean isLockedDown_native(long pointer);
+
+    private native boolean isMaelstrommed_native(long pointer);
+
+    private native boolean isMorphing_native(long pointer);
+
+    private native boolean isMoving_native(long pointer);
+
+    private native boolean isParasited_native(long pointer);
+
+    private native boolean isPatrolling_native(long pointer);
+
+    private native boolean isPlagued_native(long pointer);
+
+    private native boolean isRepairing_native(long pointer);
+
+    private native boolean isResearching_native(long pointer);
+
+    private native boolean isSelected_native(long pointer);
+
+    private native boolean isSieged_native(long pointer);
+
+    private native boolean isStartingAttack_native(long pointer);
+
+    private native boolean isStasised_native(long pointer);
+
+    private native boolean isStimmed_native(long pointer);
+
+    private native boolean isStuck_native(long pointer);
+
+    private native boolean isTraining_native(long pointer);
+
+    private native boolean isUnderAttack_native(long pointer);
+
+    private native boolean isUnderDarkSwarm_native(long pointer);
+
+    private native boolean isUnderDisruptionWeb_native(long pointer);
+
+    private native boolean isUnderStorm_native(long pointer);
+
+    private native boolean isPowered_native(long pointer);
+
+    private native boolean isUpgrading_native(long pointer);
+
+    private native boolean isVisible_native(long pointer);
+
+    private native boolean isVisible_native(long pointer, Player player);
+
+    private native boolean isTargetable_native(long pointer);
+
+    private native boolean issueCommand_native(long pointer, UnitCommand command);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean build_native(long pointer, UnitType type);
+
+    private native boolean build_native(long pointer, UnitType type, TilePosition target);
+
+    private native boolean buildAddon_native(long pointer, UnitType type);
+
+    private native boolean train_native(long pointer);
+
+    private native boolean train_native(long pointer, UnitType type);
+
+    private native boolean morph_native(long pointer, UnitType type);
+
+    private native boolean research_native(long pointer, TechType tech);
+
+    private native boolean upgrade_native(long pointer, UpgradeType upgrade);
+
+    private native boolean setRallyPoint_native(long pointer, PositionOrUnit target);
+
+    private native boolean move_native(long pointer, Position target);
+
+    private native boolean move_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean patrol_native(long pointer, Position target);
+
+    private native boolean patrol_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean holdPosition_native(long pointer);
+
+    private native boolean holdPosition_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean stop_native(long pointer);
+
+    private native boolean stop_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean follow_native(long pointer, Unit target);
+
+    private native boolean follow_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean gather_native(long pointer, Unit target);
+
+    private native boolean gather_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean returnCargo_native(long pointer);
+
+    private native boolean returnCargo_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean repair_native(long pointer, Unit target);
+
+    private native boolean repair_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean burrow_native(long pointer);
+
+    private native boolean unburrow_native(long pointer);
+
+    private native boolean cloak_native(long pointer);
+
+    private native boolean decloak_native(long pointer);
+
+    private native boolean siege_native(long pointer);
+
+    private native boolean unsiege_native(long pointer);
+
+    private native boolean lift_native(long pointer);
+
+    private native boolean land_native(long pointer, TilePosition target);
+
+    private native boolean load_native(long pointer, Unit target);
+
+    private native boolean load_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean unload_native(long pointer, Unit target);
+
+    private native boolean unloadAll_native(long pointer);
+
+    private native boolean unloadAll_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean unloadAll_native(long pointer, Position target);
+
+    private native boolean unloadAll_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean haltConstruction_native(long pointer);
+
+    private native boolean cancelConstruction_native(long pointer);
+
+    private native boolean cancelAddon_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer, int slot);
+
+    private native boolean cancelMorph_native(long pointer);
+
+    private native boolean cancelResearch_native(long pointer);
+
+    private native boolean cancelUpgrade_native(long pointer);
+
+    private native boolean useTech_native(long pointer, TechType tech);
+
+    private native boolean useTech_native(long pointer, TechType tech, PositionOrUnit target);
+
+    private native boolean placeCOP_native(long pointer, TilePosition target);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command);
+
+    private native boolean canIssueCommand_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanBuildUnitType, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command);
+
+    private native boolean canIssueCommandGrouped_native(long pointer, UnitCommand command, boolean checkCanUseTechPositionOnPositions, boolean checkCanUseTechUnitOnUnits, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canCommand_native(long pointer);
+
+    private native boolean canCommandGrouped_native(long pointer);
+
+    private native boolean canCommandGrouped_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canIssueCommandType_native(long pointer, UnitCommandType ct);
+
+    private native boolean canIssueCommandType_native(long pointer, UnitCommandType ct, boolean checkCommandibility);
+
+    private native boolean canIssueCommandTypeGrouped_native(long pointer, UnitCommandType ct, boolean checkCommandibilityGrouped);
+
+    private native boolean canIssueCommandTypeGrouped_native(long pointer, UnitCommandType ct);
+
+    private native boolean canIssueCommandTypeGrouped_native(long pointer, UnitCommandType ct, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canTargetUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canTargetUnit_native(long pointer, Unit targetUnit, boolean checkCommandibility);
+
+    private native boolean canAttack_native(long pointer);
+
+    private native boolean canAttack_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target);
+
+    private native boolean canAttack_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canAttackGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackGrouped_native(long pointer);
+
+    private native boolean canAttackGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target);
+
+    private native boolean canAttackGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackMove_native(long pointer);
+
+    private native boolean canAttackMove_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canAttackMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackMoveGrouped_native(long pointer);
+
+    private native boolean canAttackMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackUnit_native(long pointer);
+
+    private native boolean canAttackUnit_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canAttackUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackUnitGrouped_native(long pointer);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit);
+
+    private native boolean canAttackUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canBuild_native(long pointer);
+
+    private native boolean canBuild_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos, boolean checkTargetUnitType);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos);
+
+    private native boolean canBuild_native(long pointer, UnitType uType, TilePosition tilePos, boolean checkTargetUnitType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canBuildAddon_native(long pointer);
+
+    private native boolean canBuildAddon_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canBuildAddon_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canBuildAddon_native(long pointer, UnitType uType);
+
+    private native boolean canBuildAddon_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canTrain_native(long pointer);
+
+    private native boolean canTrain_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canTrain_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canTrain_native(long pointer, UnitType uType);
+
+    private native boolean canTrain_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canMorph_native(long pointer);
+
+    private native boolean canMorph_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canMorph_native(long pointer, UnitType uType, boolean checkCanIssueCommandType);
+
+    private native boolean canMorph_native(long pointer, UnitType uType);
+
+    private native boolean canMorph_native(long pointer, UnitType uType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canResearch_native(long pointer);
+
+    private native boolean canResearch_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canResearch_native(long pointer, TechType type);
+
+    private native boolean canResearch_native(long pointer, TechType type, boolean checkCanIssueCommandType);
+
+    private native boolean canUpgrade_native(long pointer);
+
+    private native boolean canUpgrade_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type);
+
+    private native boolean canUpgrade_native(long pointer, UpgradeType type, boolean checkCanIssueCommandType);
+
+    private native boolean canSetRallyPoint_native(long pointer);
+
+    private native boolean canSetRallyPoint_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target);
+
+    private native boolean canSetRallyPoint_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canSetRallyPosition_native(long pointer);
+
+    private native boolean canSetRallyPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSetRallyUnit_native(long pointer);
+
+    private native boolean canSetRallyUnit_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canSetRallyUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canMove_native(long pointer);
+
+    private native boolean canMove_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canMoveGrouped_native(long pointer);
+
+    private native boolean canMoveGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canPatrol_native(long pointer);
+
+    private native boolean canPatrol_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canPatrolGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canPatrolGrouped_native(long pointer);
+
+    private native boolean canPatrolGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canFollow_native(long pointer);
+
+    private native boolean canFollow_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit);
+
+    private native boolean canFollow_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canGather_native(long pointer);
+
+    private native boolean canGather_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit);
+
+    private native boolean canGather_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canReturnCargo_native(long pointer);
+
+    private native boolean canReturnCargo_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canHoldPosition_native(long pointer);
+
+    private native boolean canHoldPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canStop_native(long pointer);
+
+    private native boolean canStop_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRepair_native(long pointer);
+
+    private native boolean canRepair_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit);
+
+    private native boolean canRepair_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canBurrow_native(long pointer);
+
+    private native boolean canBurrow_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnburrow_native(long pointer);
+
+    private native boolean canUnburrow_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCloak_native(long pointer);
+
+    private native boolean canCloak_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canDecloak_native(long pointer);
+
+    private native boolean canDecloak_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canSiege_native(long pointer);
+
+    private native boolean canSiege_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnsiege_native(long pointer);
+
+    private native boolean canUnsiege_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLift_native(long pointer);
+
+    private native boolean canLift_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLand_native(long pointer);
+
+    private native boolean canLand_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLand_native(long pointer, TilePosition target, boolean checkCanIssueCommandType);
+
+    private native boolean canLand_native(long pointer, TilePosition target);
+
+    private native boolean canLand_native(long pointer, TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canLoad_native(long pointer);
+
+    private native boolean canLoad_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit);
+
+    private native boolean canLoad_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUnloadWithOrWithoutTarget_native(long pointer);
+
+    private native boolean canUnloadWithOrWithoutTarget_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnloadAtPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType);
+
+    private native boolean canUnloadAtPosition_native(long pointer, Position targDropPos);
+
+    private native boolean canUnloadAtPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUnload_native(long pointer);
+
+    private native boolean canUnload_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit);
+
+    private native boolean canUnload_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkPosition, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUnloadAll_native(long pointer);
+
+    private native boolean canUnloadAll_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnloadAllPosition_native(long pointer);
+
+    private native boolean canUnloadAllPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUnloadAllPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType);
+
+    private native boolean canUnloadAllPosition_native(long pointer, Position targDropPos);
+
+    private native boolean canUnloadAllPosition_native(long pointer, Position targDropPos, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canRightClick_native(long pointer);
+
+    private native boolean canRightClick_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target);
+
+    private native boolean canRightClick_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canRightClickGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickGrouped_native(long pointer);
+
+    private native boolean canRightClickGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target);
+
+    private native boolean canRightClickGrouped_native(long pointer, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickPosition_native(long pointer);
+
+    private native boolean canRightClickPosition_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRightClickPositionGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickPositionGrouped_native(long pointer);
+
+    private native boolean canRightClickPositionGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickUnit_native(long pointer);
+
+    private native boolean canRightClickUnit_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit);
+
+    private native boolean canRightClickUnit_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit);
+
+    private native boolean canRightClickUnitGrouped_native(long pointer, Unit targetUnit, boolean checkCanTargetUnit, boolean checkCanIssueCommandType, boolean checkCommandibilityGrouped, boolean checkCommandibility);
+
+    private native boolean canHaltConstruction_native(long pointer);
+
+    private native boolean canHaltConstruction_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelConstruction_native(long pointer);
+
+    private native boolean canCancelConstruction_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelAddon_native(long pointer);
+
+    private native boolean canCancelAddon_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelTrain_native(long pointer);
+
+    private native boolean canCancelTrain_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelTrainSlot_native(long pointer);
+
+    private native boolean canCancelTrainSlot_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelTrainSlot_native(long pointer, int slot, boolean checkCanIssueCommandType);
+
+    private native boolean canCancelTrainSlot_native(long pointer, int slot);
+
+    private native boolean canCancelTrainSlot_native(long pointer, int slot, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canCancelMorph_native(long pointer);
+
+    private native boolean canCancelMorph_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelResearch_native(long pointer);
+
+    private native boolean canCancelResearch_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canCancelUpgrade_native(long pointer);
+
+    private native boolean canCancelUpgrade_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, TechType tech);
+
+    private native boolean canUseTechWithOrWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target);
+
+    private native boolean canUseTech_native(long pointer, TechType tech);
+
+    private native boolean canUseTech_native(long pointer, TechType tech, PositionOrUnit target, boolean checkCanTargetUnit, boolean checkTargetsType, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechWithoutTarget_native(long pointer, TechType tech);
+
+    private native boolean canUseTechWithoutTarget_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit);
+
+    private native boolean canUseTechUnit_native(long pointer, TechType tech, Unit targetUnit, boolean checkCanTargetUnit, boolean checkTargetsUnits, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target, boolean checkTargetsPositions);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target);
+
+    private native boolean canUseTechPosition_native(long pointer, TechType tech, Position target, boolean checkTargetsPositions, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+    private native boolean canPlaceCOP_native(long pointer);
+
+    private native boolean canPlaceCOP_native(long pointer, boolean checkCommandibility);
+
+    private native boolean canPlaceCOP_native(long pointer, TilePosition target, boolean checkCanIssueCommandType);
+
+    private native boolean canPlaceCOP_native(long pointer, TilePosition target);
+
+    private native boolean canPlaceCOP_native(long pointer, TilePosition target, boolean checkCanIssueCommandType, boolean checkCommandibility);
+
+
+}
diff --git a/generated/bwapi4/UnitCommand.java b/generated/bwapi4/UnitCommand.java
new file mode 100644
index 0000000..00b3d2f
--- /dev/null
+++ b/generated/bwapi4/UnitCommand.java
@@ -0,0 +1,219 @@
+package bwapi4;
+
+
+public class UnitCommand {
+
+    public static native UnitCommand attack(Unit unit, PositionOrUnit target);
+
+    public static native UnitCommand attack(Unit unit, PositionOrUnit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand build(Unit unit, TilePosition target, UnitType type);
+
+    public static native UnitCommand buildAddon(Unit unit, UnitType type);
+
+    public static native UnitCommand train(Unit unit, UnitType type);
+
+    public static native UnitCommand morph(Unit unit, UnitType type);
+
+    public static native UnitCommand research(Unit unit, TechType tech);
+
+    public static native UnitCommand upgrade(Unit unit, UpgradeType upgrade);
+
+    public static native UnitCommand setRallyPoint(Unit unit, PositionOrUnit target);
+
+    public static native UnitCommand move(Unit unit, Position target);
+
+    public static native UnitCommand move(Unit unit, Position target, boolean shiftQueueCommand);
+
+    public static native UnitCommand patrol(Unit unit, Position target);
+
+    public static native UnitCommand patrol(Unit unit, Position target, boolean shiftQueueCommand);
+
+    public static native UnitCommand holdPosition(Unit unit);
+
+    public static native UnitCommand holdPosition(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand stop(Unit unit);
+
+    public static native UnitCommand stop(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand follow(Unit unit, Unit target);
+
+    public static native UnitCommand follow(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand gather(Unit unit, Unit target);
+
+    public static native UnitCommand gather(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand returnCargo(Unit unit);
+
+    public static native UnitCommand returnCargo(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand repair(Unit unit, Unit target);
+
+    public static native UnitCommand repair(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand burrow(Unit unit);
+
+    public static native UnitCommand unburrow(Unit unit);
+
+    public static native UnitCommand cloak(Unit unit);
+
+    public static native UnitCommand decloak(Unit unit);
+
+    public static native UnitCommand siege(Unit unit);
+
+    public static native UnitCommand unsiege(Unit unit);
+
+    public static native UnitCommand lift(Unit unit);
+
+    public static native UnitCommand land(Unit unit, TilePosition target);
+
+    public static native UnitCommand load(Unit unit, Unit target);
+
+    public static native UnitCommand load(Unit unit, Unit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand unload(Unit unit, Unit target);
+
+    public static native UnitCommand unloadAll(Unit unit);
+
+    public static native UnitCommand unloadAll(Unit unit, boolean shiftQueueCommand);
+
+    public static native UnitCommand unloadAll(Unit unit, Position target);
+
+    public static native UnitCommand unloadAll(Unit unit, Position target, boolean shiftQueueCommand);
+
+    public static native UnitCommand rightClick(Unit unit, PositionOrUnit target);
+
+    public static native UnitCommand rightClick(Unit unit, PositionOrUnit target, boolean shiftQueueCommand);
+
+    public static native UnitCommand haltConstruction(Unit unit);
+
+    public static native UnitCommand cancelConstruction(Unit unit);
+
+    public static native UnitCommand cancelAddon(Unit unit);
+
+    public static native UnitCommand cancelTrain(Unit unit);
+
+    public static native UnitCommand cancelTrain(Unit unit, int slot);
+
+    public static native UnitCommand cancelMorph(Unit unit);
+
+    public static native UnitCommand cancelResearch(Unit unit);
+
+    public static native UnitCommand cancelUpgrade(Unit unit);
+
+    public static native UnitCommand useTech(Unit unit, TechType tech);
+
+    public static native UnitCommand useTech(Unit unit, TechType tech, PositionOrUnit target);
+
+    public static native UnitCommand placeCOP(Unit unit, TilePosition target);
+
+    private Unit unit;
+
+    private UnitCommandType unitCommandType;
+
+    private Unit target;
+
+    private int x, y;
+
+    private int extra;
+
+    private UnitCommand(Unit unit, UnitCommandType unitCommandType, Unit target, int x, int y, int extra) {
+        this.unit = unit;
+        this.unitCommandType = unitCommandType;
+        this.target = target;
+        this.x = x;
+        this.y = y;
+        this.extra = extra;
+    }
+
+    public Unit getUnit() {
+        return unit;
+    }
+
+    public UnitCommandType getUnitCommandType() {
+        return unitCommandType;
+    }
+
+    public Unit getTarget() {
+        return target;
+    }
+
+
+
+    public int getSlot() {
+        if (unitCommandType == UnitCommandType.None) {
+            return extra;
+        }
+        return -1;
+    }
+
+    public Position getTargetPosition() {
+        if (unitCommandType == UnitCommandType.Build ||
+                unitCommandType == UnitCommandType.Land ||
+                unitCommandType == UnitCommandType.Place_COP) {
+            return new Position(x * 32, y * 32);
+        }
+        return new Position(x, y);
+    }
+
+    public TilePosition getTargetTilePosition() {
+        if (unitCommandType == UnitCommandType.Build ||
+                unitCommandType == UnitCommandType.Land ||
+                unitCommandType == UnitCommandType.Place_COP) {
+            return new TilePosition(x, y);
+        }
+        return new TilePosition(x / 32, y / 32);
+    }
+
+    public boolean isQueued() {
+        if (unitCommandType == UnitCommandType.Attack_Move ||
+                unitCommandType == UnitCommandType.Attack_Unit ||
+                unitCommandType == UnitCommandType.Move ||
+                unitCommandType == UnitCommandType.Patrol ||
+                unitCommandType == UnitCommandType.Hold_Position ||
+                unitCommandType == UnitCommandType.Stop ||
+                unitCommandType == UnitCommandType.Follow ||
+                unitCommandType == UnitCommandType.Gather ||
+                unitCommandType == UnitCommandType.Return_Cargo ||
+                unitCommandType == UnitCommandType.Repair ||
+                unitCommandType == UnitCommandType.Load ||
+                unitCommandType == UnitCommandType.Unload_All ||
+                unitCommandType == UnitCommandType.Unload_All_Position ||
+                unitCommandType == UnitCommandType.Right_Click_Position ||
+                unitCommandType == UnitCommandType.Right_Click_Unit) {
+            return extra != 0;
+        }
+        return false;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof UnitCommand)) return false;
+
+        UnitCommand that = (UnitCommand) o;
+
+        if (extra != that.extra) return false;
+        if (x != that.x) return false;
+        if (y != that.y) return false;
+        if (target != null ? !target.equals(that.target) : that.target != null) return false;
+        if (unit != null ? !unit.equals(that.unit) : that.unit != null) return false;
+        if (unitCommandType != null ? !unitCommandType.equals(that.unitCommandType) : that.unitCommandType != null)
+            return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = unit != null ? unit.hashCode() : 0;
+        result = 31 * result + (unitCommandType != null ? unitCommandType.hashCode() : 0);
+        result = 31 * result + (target != null ? target.hashCode() : 0);
+        result = 31 * result + x;
+        result = 31 * result + y;
+        result = 31 * result + extra;
+        return result;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/UnitCommandType.java b/generated/bwapi4/UnitCommandType.java
new file mode 100644
index 0000000..e407700
--- /dev/null
+++ b/generated/bwapi4/UnitCommandType.java
@@ -0,0 +1,132 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitCommandType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static UnitCommandType Attack_Move;
+
+    public static UnitCommandType Attack_Unit;
+
+    public static UnitCommandType Build;
+
+    public static UnitCommandType Build_Addon;
+
+    public static UnitCommandType Train;
+
+    public static UnitCommandType Morph;
+
+    public static UnitCommandType Research;
+
+    public static UnitCommandType Upgrade;
+
+    public static UnitCommandType Set_Rally_Position;
+
+    public static UnitCommandType Set_Rally_Unit;
+
+    public static UnitCommandType Move;
+
+    public static UnitCommandType Patrol;
+
+    public static UnitCommandType Hold_Position;
+
+    public static UnitCommandType Stop;
+
+    public static UnitCommandType Follow;
+
+    public static UnitCommandType Gather;
+
+    public static UnitCommandType Return_Cargo;
+
+    public static UnitCommandType Repair;
+
+    public static UnitCommandType Burrow;
+
+    public static UnitCommandType Unburrow;
+
+    public static UnitCommandType Cloak;
+
+    public static UnitCommandType Decloak;
+
+    public static UnitCommandType Siege;
+
+    public static UnitCommandType Unsiege;
+
+    public static UnitCommandType Lift;
+
+    public static UnitCommandType Land;
+
+    public static UnitCommandType Load;
+
+    public static UnitCommandType Unload;
+
+    public static UnitCommandType Unload_All;
+
+    public static UnitCommandType Unload_All_Position;
+
+    public static UnitCommandType Right_Click_Position;
+
+    public static UnitCommandType Right_Click_Unit;
+
+    public static UnitCommandType Halt_Construction;
+
+    public static UnitCommandType Cancel_Construction;
+
+    public static UnitCommandType Cancel_Addon;
+
+    public static UnitCommandType Cancel_Train;
+
+    public static UnitCommandType Cancel_Train_Slot;
+
+    public static UnitCommandType Cancel_Morph;
+
+    public static UnitCommandType Cancel_Research;
+
+    public static UnitCommandType Cancel_Upgrade;
+
+    public static UnitCommandType Use_Tech;
+
+    public static UnitCommandType Use_Tech_Position;
+
+    public static UnitCommandType Use_Tech_Unit;
+
+    public static UnitCommandType Place_COP;
+
+    public static UnitCommandType None;
+
+    public static UnitCommandType Unknown;
+
+
+    private static Map<Long, UnitCommandType> instances = new HashMap<Long, UnitCommandType>();
+
+    private UnitCommandType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitCommandType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnitCommandType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitCommandType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/UnitFilter.java b/generated/bwapi4/UnitFilter.java
new file mode 100644
index 0000000..99f65d6
--- /dev/null
+++ b/generated/bwapi4/UnitFilter.java
@@ -0,0 +1,31 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitFilter {
+
+
+    private static Map<Long, UnitFilter> instances = new HashMap<Long, UnitFilter>();
+
+    private UnitFilter(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitFilter get(long pointer) {
+        UnitFilter instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitFilter(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+
+}
diff --git a/generated/bwapi4/UnitSizeType.java b/generated/bwapi4/UnitSizeType.java
new file mode 100644
index 0000000..7633b99
--- /dev/null
+++ b/generated/bwapi4/UnitSizeType.java
@@ -0,0 +1,52 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitSizeType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public static UnitSizeType Independent;
+
+    public static UnitSizeType Small;
+
+    public static UnitSizeType Medium;
+
+    public static UnitSizeType Large;
+
+    public static UnitSizeType None;
+
+    public static UnitSizeType Unknown;
+
+
+    private static Map<Long, UnitSizeType> instances = new HashMap<Long, UnitSizeType>();
+
+    private UnitSizeType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitSizeType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnitSizeType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitSizeType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/UnitType.java b/generated/bwapi4/UnitType.java
new file mode 100644
index 0000000..ae0acc8
--- /dev/null
+++ b/generated/bwapi4/UnitType.java
@@ -0,0 +1,894 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UnitType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public TechType requiredTech() {
+        return requiredTech_native(pointer);
+    }
+
+    public TechType cloakingTech() {
+        return cloakingTech_native(pointer);
+    }
+
+    public UpgradeType armorUpgrade() {
+        return armorUpgrade_native(pointer);
+    }
+
+    public int maxHitPoints() {
+        return maxHitPoints_native(pointer);
+    }
+
+    public int maxShields() {
+        return maxShields_native(pointer);
+    }
+
+    public int maxEnergy() {
+        return maxEnergy_native(pointer);
+    }
+
+    public int armor() {
+        return armor_native(pointer);
+    }
+
+    public int mineralPrice() {
+        return mineralPrice_native(pointer);
+    }
+
+    public int gasPrice() {
+        return gasPrice_native(pointer);
+    }
+
+    public int buildTime() {
+        return buildTime_native(pointer);
+    }
+
+    public int supplyRequired() {
+        return supplyRequired_native(pointer);
+    }
+
+    public int supplyProvided() {
+        return supplyProvided_native(pointer);
+    }
+
+    public int spaceRequired() {
+        return spaceRequired_native(pointer);
+    }
+
+    public int spaceProvided() {
+        return spaceProvided_native(pointer);
+    }
+
+    public int buildScore() {
+        return buildScore_native(pointer);
+    }
+
+    public int destroyScore() {
+        return destroyScore_native(pointer);
+    }
+
+    public UnitSizeType size() {
+        return size_native(pointer);
+    }
+
+    public int tileWidth() {
+        return tileWidth_native(pointer);
+    }
+
+    public int tileHeight() {
+        return tileHeight_native(pointer);
+    }
+
+    public TilePosition tileSize() {
+        return tileSize_native(pointer);
+    }
+
+    public int dimensionLeft() {
+        return dimensionLeft_native(pointer);
+    }
+
+    public int dimensionUp() {
+        return dimensionUp_native(pointer);
+    }
+
+    public int dimensionRight() {
+        return dimensionRight_native(pointer);
+    }
+
+    public int dimensionDown() {
+        return dimensionDown_native(pointer);
+    }
+
+    public int width() {
+        return width_native(pointer);
+    }
+
+    public int height() {
+        return height_native(pointer);
+    }
+
+    public int seekRange() {
+        return seekRange_native(pointer);
+    }
+
+    public int sightRange() {
+        return sightRange_native(pointer);
+    }
+
+    public WeaponType groundWeapon() {
+        return groundWeapon_native(pointer);
+    }
+
+    public int maxGroundHits() {
+        return maxGroundHits_native(pointer);
+    }
+
+    public WeaponType airWeapon() {
+        return airWeapon_native(pointer);
+    }
+
+    public int maxAirHits() {
+        return maxAirHits_native(pointer);
+    }
+
+    public double topSpeed() {
+        return topSpeed_native(pointer);
+    }
+
+    public int acceleration() {
+        return acceleration_native(pointer);
+    }
+
+    public int haltDistance() {
+        return haltDistance_native(pointer);
+    }
+
+    public int turnRadius() {
+        return turnRadius_native(pointer);
+    }
+
+    public boolean canProduce() {
+        return canProduce_native(pointer);
+    }
+
+    public boolean canAttack() {
+        return canAttack_native(pointer);
+    }
+
+    public boolean canMove() {
+        return canMove_native(pointer);
+    }
+
+    public boolean isFlyer() {
+        return isFlyer_native(pointer);
+    }
+
+    public boolean regeneratesHP() {
+        return regeneratesHP_native(pointer);
+    }
+
+    public boolean isSpellcaster() {
+        return isSpellcaster_native(pointer);
+    }
+
+    public boolean hasPermanentCloak() {
+        return hasPermanentCloak_native(pointer);
+    }
+
+    public boolean isInvincible() {
+        return isInvincible_native(pointer);
+    }
+
+    public boolean isOrganic() {
+        return isOrganic_native(pointer);
+    }
+
+    public boolean isMechanical() {
+        return isMechanical_native(pointer);
+    }
+
+    public boolean isRobotic() {
+        return isRobotic_native(pointer);
+    }
+
+    public boolean isDetector() {
+        return isDetector_native(pointer);
+    }
+
+    public boolean isResourceContainer() {
+        return isResourceContainer_native(pointer);
+    }
+
+    public boolean isResourceDepot() {
+        return isResourceDepot_native(pointer);
+    }
+
+    public boolean isRefinery() {
+        return isRefinery_native(pointer);
+    }
+
+    public boolean isWorker() {
+        return isWorker_native(pointer);
+    }
+
+    public boolean requiresPsi() {
+        return requiresPsi_native(pointer);
+    }
+
+    public boolean requiresCreep() {
+        return requiresCreep_native(pointer);
+    }
+
+    public boolean isTwoUnitsInOneEgg() {
+        return isTwoUnitsInOneEgg_native(pointer);
+    }
+
+    public boolean isBurrowable() {
+        return isBurrowable_native(pointer);
+    }
+
+    public boolean isCloakable() {
+        return isCloakable_native(pointer);
+    }
+
+    public boolean isBuilding() {
+        return isBuilding_native(pointer);
+    }
+
+    public boolean isAddon() {
+        return isAddon_native(pointer);
+    }
+
+    public boolean isFlyingBuilding() {
+        return isFlyingBuilding_native(pointer);
+    }
+
+    public boolean isNeutral() {
+        return isNeutral_native(pointer);
+    }
+
+    public boolean isHero() {
+        return isHero_native(pointer);
+    }
+
+    public boolean isPowerup() {
+        return isPowerup_native(pointer);
+    }
+
+    public boolean isBeacon() {
+        return isBeacon_native(pointer);
+    }
+
+    public boolean isFlagBeacon() {
+        return isFlagBeacon_native(pointer);
+    }
+
+    public boolean isSpecialBuilding() {
+        return isSpecialBuilding_native(pointer);
+    }
+
+    public boolean isSpell() {
+        return isSpell_native(pointer);
+    }
+
+    public boolean producesLarva() {
+        return producesLarva_native(pointer);
+    }
+
+    public boolean isMineralField() {
+        return isMineralField_native(pointer);
+    }
+
+    public boolean isCritter() {
+        return isCritter_native(pointer);
+    }
+
+    public boolean canBuildAddon() {
+        return canBuildAddon_native(pointer);
+    }
+
+    public static UnitType Terran_Marine;
+
+    public static UnitType Terran_Ghost;
+
+    public static UnitType Terran_Vulture;
+
+    public static UnitType Terran_Goliath;
+
+    public static UnitType Terran_Siege_Tank_Tank_Mode;
+
+    public static UnitType Terran_SCV;
+
+    public static UnitType Terran_Wraith;
+
+    public static UnitType Terran_Science_Vessel;
+
+    public static UnitType Hero_Gui_Montag;
+
+    public static UnitType Terran_Dropship;
+
+    public static UnitType Terran_Battlecruiser;
+
+    public static UnitType Terran_Vulture_Spider_Mine;
+
+    public static UnitType Terran_Nuclear_Missile;
+
+    public static UnitType Terran_Civilian;
+
+    public static UnitType Hero_Sarah_Kerrigan;
+
+    public static UnitType Hero_Alan_Schezar;
+
+    public static UnitType Hero_Jim_Raynor_Vulture;
+
+    public static UnitType Hero_Jim_Raynor_Marine;
+
+    public static UnitType Hero_Tom_Kazansky;
+
+    public static UnitType Hero_Magellan;
+
+    public static UnitType Hero_Edmund_Duke_Tank_Mode;
+
+    public static UnitType Hero_Edmund_Duke_Siege_Mode;
+
+    public static UnitType Hero_Arcturus_Mengsk;
+
+    public static UnitType Hero_Hyperion;
+
+    public static UnitType Hero_Norad_II;
+
+    public static UnitType Terran_Siege_Tank_Siege_Mode;
+
+    public static UnitType Terran_Firebat;
+
+    public static UnitType Spell_Scanner_Sweep;
+
+    public static UnitType Terran_Medic;
+
+    public static UnitType Zerg_Larva;
+
+    public static UnitType Zerg_Egg;
+
+    public static UnitType Zerg_Zergling;
+
+    public static UnitType Zerg_Hydralisk;
+
+    public static UnitType Zerg_Ultralisk;
+
+    public static UnitType Zerg_Broodling;
+
+    public static UnitType Zerg_Drone;
+
+    public static UnitType Zerg_Overlord;
+
+    public static UnitType Zerg_Mutalisk;
+
+    public static UnitType Zerg_Guardian;
+
+    public static UnitType Zerg_Queen;
+
+    public static UnitType Zerg_Defiler;
+
+    public static UnitType Zerg_Scourge;
+
+    public static UnitType Hero_Torrasque;
+
+    public static UnitType Hero_Matriarch;
+
+    public static UnitType Zerg_Infested_Terran;
+
+    public static UnitType Hero_Infested_Kerrigan;
+
+    public static UnitType Hero_Unclean_One;
+
+    public static UnitType Hero_Hunter_Killer;
+
+    public static UnitType Hero_Devouring_One;
+
+    public static UnitType Hero_Kukulza_Mutalisk;
+
+    public static UnitType Hero_Kukulza_Guardian;
+
+    public static UnitType Hero_Yggdrasill;
+
+    public static UnitType Terran_Valkyrie;
+
+    public static UnitType Zerg_Cocoon;
+
+    public static UnitType Protoss_Corsair;
+
+    public static UnitType Protoss_Dark_Templar;
+
+    public static UnitType Zerg_Devourer;
+
+    public static UnitType Protoss_Dark_Archon;
+
+    public static UnitType Protoss_Probe;
+
+    public static UnitType Protoss_Zealot;
+
+    public static UnitType Protoss_Dragoon;
+
+    public static UnitType Protoss_High_Templar;
+
+    public static UnitType Protoss_Archon;
+
+    public static UnitType Protoss_Shuttle;
+
+    public static UnitType Protoss_Scout;
+
+    public static UnitType Protoss_Arbiter;
+
+    public static UnitType Protoss_Carrier;
+
+    public static UnitType Protoss_Interceptor;
+
+    public static UnitType Hero_Dark_Templar;
+
+    public static UnitType Hero_Zeratul;
+
+    public static UnitType Hero_Tassadar_Zeratul_Archon;
+
+    public static UnitType Hero_Fenix_Zealot;
+
+    public static UnitType Hero_Fenix_Dragoon;
+
+    public static UnitType Hero_Tassadar;
+
+    public static UnitType Hero_Mojo;
+
+    public static UnitType Hero_Warbringer;
+
+    public static UnitType Hero_Gantrithor;
+
+    public static UnitType Protoss_Reaver;
+
+    public static UnitType Protoss_Observer;
+
+    public static UnitType Protoss_Scarab;
+
+    public static UnitType Hero_Danimoth;
+
+    public static UnitType Hero_Aldaris;
+
+    public static UnitType Hero_Artanis;
+
+    public static UnitType Critter_Rhynadon;
+
+    public static UnitType Critter_Bengalaas;
+
+    public static UnitType Special_Cargo_Ship;
+
+    public static UnitType Special_Mercenary_Gunship;
+
+    public static UnitType Critter_Scantid;
+
+    public static UnitType Critter_Kakaru;
+
+    public static UnitType Critter_Ragnasaur;
+
+    public static UnitType Critter_Ursadon;
+
+    public static UnitType Zerg_Lurker_Egg;
+
+    public static UnitType Hero_Raszagal;
+
+    public static UnitType Hero_Samir_Duran;
+
+    public static UnitType Hero_Alexei_Stukov;
+
+    public static UnitType Special_Map_Revealer;
+
+    public static UnitType Hero_Gerard_DuGalle;
+
+    public static UnitType Zerg_Lurker;
+
+    public static UnitType Hero_Infested_Duran;
+
+    public static UnitType Spell_Disruption_Web;
+
+    public static UnitType Terran_Command_Center;
+
+    public static UnitType Terran_Comsat_Station;
+
+    public static UnitType Terran_Nuclear_Silo;
+
+    public static UnitType Terran_Supply_Depot;
+
+    public static UnitType Terran_Refinery;
+
+    public static UnitType Terran_Barracks;
+
+    public static UnitType Terran_Academy;
+
+    public static UnitType Terran_Factory;
+
+    public static UnitType Terran_Starport;
+
+    public static UnitType Terran_Control_Tower;
+
+    public static UnitType Terran_Science_Facility;
+
+    public static UnitType Terran_Covert_Ops;
+
+    public static UnitType Terran_Physics_Lab;
+
+    public static UnitType Terran_Machine_Shop;
+
+    public static UnitType Terran_Engineering_Bay;
+
+    public static UnitType Terran_Armory;
+
+    public static UnitType Terran_Missile_Turret;
+
+    public static UnitType Terran_Bunker;
+
+    public static UnitType Special_Crashed_Norad_II;
+
+    public static UnitType Special_Ion_Cannon;
+
+    public static UnitType Powerup_Uraj_Crystal;
+
+    public static UnitType Powerup_Khalis_Crystal;
+
+    public static UnitType Zerg_Infested_Command_Center;
+
+    public static UnitType Zerg_Hatchery;
+
+    public static UnitType Zerg_Lair;
+
+    public static UnitType Zerg_Hive;
+
+    public static UnitType Zerg_Nydus_Canal;
+
+    public static UnitType Zerg_Hydralisk_Den;
+
+    public static UnitType Zerg_Defiler_Mound;
+
+    public static UnitType Zerg_Greater_Spire;
+
+    public static UnitType Zerg_Queens_Nest;
+
+    public static UnitType Zerg_Evolution_Chamber;
+
+    public static UnitType Zerg_Ultralisk_Cavern;
+
+    public static UnitType Zerg_Spire;
+
+    public static UnitType Zerg_Spawning_Pool;
+
+    public static UnitType Zerg_Creep_Colony;
+
+    public static UnitType Zerg_Spore_Colony;
+
+    public static UnitType Zerg_Sunken_Colony;
+
+    public static UnitType Special_Overmind_With_Shell;
+
+    public static UnitType Special_Overmind;
+
+    public static UnitType Zerg_Extractor;
+
+    public static UnitType Special_Mature_Chrysalis;
+
+    public static UnitType Special_Cerebrate;
+
+    public static UnitType Special_Cerebrate_Daggoth;
+
+    public static UnitType Protoss_Nexus;
+
+    public static UnitType Protoss_Robotics_Facility;
+
+    public static UnitType Protoss_Pylon;
+
+    public static UnitType Protoss_Assimilator;
+
+    public static UnitType Protoss_Observatory;
+
+    public static UnitType Protoss_Gateway;
+
+    public static UnitType Protoss_Photon_Cannon;
+
+    public static UnitType Protoss_Citadel_of_Adun;
+
+    public static UnitType Protoss_Cybernetics_Core;
+
+    public static UnitType Protoss_Templar_Archives;
+
+    public static UnitType Protoss_Forge;
+
+    public static UnitType Protoss_Stargate;
+
+    public static UnitType Special_Stasis_Cell_Prison;
+
+    public static UnitType Protoss_Fleet_Beacon;
+
+    public static UnitType Protoss_Arbiter_Tribunal;
+
+    public static UnitType Protoss_Robotics_Support_Bay;
+
+    public static UnitType Protoss_Shield_Battery;
+
+    public static UnitType Special_Khaydarin_Crystal_Form;
+
+    public static UnitType Special_Protoss_Temple;
+
+    public static UnitType Special_XelNaga_Temple;
+
+    public static UnitType Resource_Mineral_Field;
+
+    public static UnitType Resource_Mineral_Field_Type_2;
+
+    public static UnitType Resource_Mineral_Field_Type_3;
+
+    public static UnitType Special_Independant_Starport;
+
+    public static UnitType Resource_Vespene_Geyser;
+
+    public static UnitType Special_Warp_Gate;
+
+    public static UnitType Special_Psi_Disrupter;
+
+    public static UnitType Special_Zerg_Beacon;
+
+    public static UnitType Special_Terran_Beacon;
+
+    public static UnitType Special_Protoss_Beacon;
+
+    public static UnitType Special_Zerg_Flag_Beacon;
+
+    public static UnitType Special_Terran_Flag_Beacon;
+
+    public static UnitType Special_Protoss_Flag_Beacon;
+
+    public static UnitType Special_Power_Generator;
+
+    public static UnitType Special_Overmind_Cocoon;
+
+    public static UnitType Spell_Dark_Swarm;
+
+    public static UnitType Special_Floor_Missile_Trap;
+
+    public static UnitType Special_Floor_Hatch;
+
+    public static UnitType Special_Upper_Level_Door;
+
+    public static UnitType Special_Right_Upper_Level_Door;
+
+    public static UnitType Special_Pit_Door;
+
+    public static UnitType Special_Right_Pit_Door;
+
+    public static UnitType Special_Floor_Gun_Trap;
+
+    public static UnitType Special_Wall_Missile_Trap;
+
+    public static UnitType Special_Wall_Flame_Trap;
+
+    public static UnitType Special_Right_Wall_Missile_Trap;
+
+    public static UnitType Special_Right_Wall_Flame_Trap;
+
+    public static UnitType Special_Start_Location;
+
+    public static UnitType Powerup_Flag;
+
+    public static UnitType Powerup_Young_Chrysalis;
+
+    public static UnitType Powerup_Psi_Emitter;
+
+    public static UnitType Powerup_Data_Disk;
+
+    public static UnitType Powerup_Khaydarin_Crystal;
+
+    public static UnitType Powerup_Mineral_Cluster_Type_1;
+
+    public static UnitType Powerup_Mineral_Cluster_Type_2;
+
+    public static UnitType Powerup_Protoss_Gas_Orb_Type_1;
+
+    public static UnitType Powerup_Protoss_Gas_Orb_Type_2;
+
+    public static UnitType Powerup_Zerg_Gas_Sac_Type_1;
+
+    public static UnitType Powerup_Zerg_Gas_Sac_Type_2;
+
+    public static UnitType Powerup_Terran_Gas_Tank_Type_1;
+
+    public static UnitType Powerup_Terran_Gas_Tank_Type_2;
+
+    public static UnitType None;
+
+    public static UnitType AllUnits;
+
+    public static UnitType Men;
+
+    public static UnitType Buildings;
+
+    public static UnitType Factories;
+
+    public static UnitType Unknown;
+
+
+    private static Map<Long, UnitType> instances = new HashMap<Long, UnitType>();
+
+    private UnitType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UnitType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UnitType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UnitType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native TechType requiredTech_native(long pointer);
+
+    private native TechType cloakingTech_native(long pointer);
+
+    private native UpgradeType armorUpgrade_native(long pointer);
+
+    private native int maxHitPoints_native(long pointer);
+
+    private native int maxShields_native(long pointer);
+
+    private native int maxEnergy_native(long pointer);
+
+    private native int armor_native(long pointer);
+
+    private native int mineralPrice_native(long pointer);
+
+    private native int gasPrice_native(long pointer);
+
+    private native int buildTime_native(long pointer);
+
+    private native int supplyRequired_native(long pointer);
+
+    private native int supplyProvided_native(long pointer);
+
+    private native int spaceRequired_native(long pointer);
+
+    private native int spaceProvided_native(long pointer);
+
+    private native int buildScore_native(long pointer);
+
+    private native int destroyScore_native(long pointer);
+
+    private native UnitSizeType size_native(long pointer);
+
+    private native int tileWidth_native(long pointer);
+
+    private native int tileHeight_native(long pointer);
+
+    private native TilePosition tileSize_native(long pointer);
+
+    private native int dimensionLeft_native(long pointer);
+
+    private native int dimensionUp_native(long pointer);
+
+    private native int dimensionRight_native(long pointer);
+
+    private native int dimensionDown_native(long pointer);
+
+    private native int width_native(long pointer);
+
+    private native int height_native(long pointer);
+
+    private native int seekRange_native(long pointer);
+
+    private native int sightRange_native(long pointer);
+
+    private native WeaponType groundWeapon_native(long pointer);
+
+    private native int maxGroundHits_native(long pointer);
+
+    private native WeaponType airWeapon_native(long pointer);
+
+    private native int maxAirHits_native(long pointer);
+
+    private native double topSpeed_native(long pointer);
+
+    private native int acceleration_native(long pointer);
+
+    private native int haltDistance_native(long pointer);
+
+    private native int turnRadius_native(long pointer);
+
+    private native boolean canProduce_native(long pointer);
+
+    private native boolean canAttack_native(long pointer);
+
+    private native boolean canMove_native(long pointer);
+
+    private native boolean isFlyer_native(long pointer);
+
+    private native boolean regeneratesHP_native(long pointer);
+
+    private native boolean isSpellcaster_native(long pointer);
+
+    private native boolean hasPermanentCloak_native(long pointer);
+
+    private native boolean isInvincible_native(long pointer);
+
+    private native boolean isOrganic_native(long pointer);
+
+    private native boolean isMechanical_native(long pointer);
+
+    private native boolean isRobotic_native(long pointer);
+
+    private native boolean isDetector_native(long pointer);
+
+    private native boolean isResourceContainer_native(long pointer);
+
+    private native boolean isResourceDepot_native(long pointer);
+
+    private native boolean isRefinery_native(long pointer);
+
+    private native boolean isWorker_native(long pointer);
+
+    private native boolean requiresPsi_native(long pointer);
+
+    private native boolean requiresCreep_native(long pointer);
+
+    private native boolean isTwoUnitsInOneEgg_native(long pointer);
+
+    private native boolean isBurrowable_native(long pointer);
+
+    private native boolean isCloakable_native(long pointer);
+
+    private native boolean isBuilding_native(long pointer);
+
+    private native boolean isAddon_native(long pointer);
+
+    private native boolean isFlyingBuilding_native(long pointer);
+
+    private native boolean isNeutral_native(long pointer);
+
+    private native boolean isHero_native(long pointer);
+
+    private native boolean isPowerup_native(long pointer);
+
+    private native boolean isBeacon_native(long pointer);
+
+    private native boolean isFlagBeacon_native(long pointer);
+
+    private native boolean isSpecialBuilding_native(long pointer);
+
+    private native boolean isSpell_native(long pointer);
+
+    private native boolean producesLarva_native(long pointer);
+
+    private native boolean isMineralField_native(long pointer);
+
+    private native boolean isCritter_native(long pointer);
+
+    private native boolean canBuildAddon_native(long pointer);
+
+
+}
diff --git a/generated/bwapi4/Unitset.java b/generated/bwapi4/Unitset.java
new file mode 100644
index 0000000..9444d33
--- /dev/null
+++ b/generated/bwapi4/Unitset.java
@@ -0,0 +1,358 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class Unitset {
+
+    public Position getPosition() {
+        return getPosition_native(pointer);
+    }
+
+    public List<Unit> getLoadedUnits() {
+        return getLoadedUnits_native(pointer);
+    }
+
+    public List<Unit> getInterceptors() {
+        return getInterceptors_native(pointer);
+    }
+
+    public List<Unit> getLarva() {
+        return getLarva_native(pointer);
+    }
+
+    public boolean issueCommand(UnitCommand command) {
+        return issueCommand_native(pointer, command);
+    }
+
+    public boolean attack(PositionOrUnit target) {
+        return attack_native(pointer, target);
+    }
+
+    public boolean attack(PositionOrUnit target, boolean shiftQueueCommand) {
+        return attack_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean build(UnitType type) {
+        return build_native(pointer, type);
+    }
+
+    public boolean build(UnitType type, TilePosition target) {
+        return build_native(pointer, type, target);
+    }
+
+    public boolean buildAddon(UnitType type) {
+        return buildAddon_native(pointer, type);
+    }
+
+    public boolean train(UnitType type) {
+        return train_native(pointer, type);
+    }
+
+    public boolean morph(UnitType type) {
+        return morph_native(pointer, type);
+    }
+
+    public boolean setRallyPoint(PositionOrUnit target) {
+        return setRallyPoint_native(pointer, target);
+    }
+
+    public boolean move(Position target) {
+        return move_native(pointer, target);
+    }
+
+    public boolean move(Position target, boolean shiftQueueCommand) {
+        return move_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean patrol(Position target) {
+        return patrol_native(pointer, target);
+    }
+
+    public boolean patrol(Position target, boolean shiftQueueCommand) {
+        return patrol_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean holdPosition() {
+        return holdPosition_native(pointer);
+    }
+
+    public boolean holdPosition(boolean shiftQueueCommand) {
+        return holdPosition_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean stop() {
+        return stop_native(pointer);
+    }
+
+    public boolean stop(boolean shiftQueueCommand) {
+        return stop_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean follow(Unit target) {
+        return follow_native(pointer, target);
+    }
+
+    public boolean follow(Unit target, boolean shiftQueueCommand) {
+        return follow_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean gather(Unit target) {
+        return gather_native(pointer, target);
+    }
+
+    public boolean gather(Unit target, boolean shiftQueueCommand) {
+        return gather_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean returnCargo() {
+        return returnCargo_native(pointer);
+    }
+
+    public boolean returnCargo(boolean shiftQueueCommand) {
+        return returnCargo_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean repair(Unit target) {
+        return repair_native(pointer, target);
+    }
+
+    public boolean repair(Unit target, boolean shiftQueueCommand) {
+        return repair_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean burrow() {
+        return burrow_native(pointer);
+    }
+
+    public boolean unburrow() {
+        return unburrow_native(pointer);
+    }
+
+    public boolean cloak() {
+        return cloak_native(pointer);
+    }
+
+    public boolean decloak() {
+        return decloak_native(pointer);
+    }
+
+    public boolean siege() {
+        return siege_native(pointer);
+    }
+
+    public boolean unsiege() {
+        return unsiege_native(pointer);
+    }
+
+    public boolean lift() {
+        return lift_native(pointer);
+    }
+
+    public boolean load(Unit target) {
+        return load_native(pointer, target);
+    }
+
+    public boolean load(Unit target, boolean shiftQueueCommand) {
+        return load_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean unloadAll() {
+        return unloadAll_native(pointer);
+    }
+
+    public boolean unloadAll(boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, shiftQueueCommand);
+    }
+
+    public boolean unloadAll(Position target) {
+        return unloadAll_native(pointer, target);
+    }
+
+    public boolean unloadAll(Position target, boolean shiftQueueCommand) {
+        return unloadAll_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean rightClick(PositionOrUnit target) {
+        return rightClick_native(pointer, target);
+    }
+
+    public boolean rightClick(PositionOrUnit target, boolean shiftQueueCommand) {
+        return rightClick_native(pointer, target, shiftQueueCommand);
+    }
+
+    public boolean haltConstruction() {
+        return haltConstruction_native(pointer);
+    }
+
+    public boolean cancelConstruction() {
+        return cancelConstruction_native(pointer);
+    }
+
+    public boolean cancelAddon() {
+        return cancelAddon_native(pointer);
+    }
+
+    public boolean cancelTrain() {
+        return cancelTrain_native(pointer);
+    }
+
+    public boolean cancelTrain(int slot) {
+        return cancelTrain_native(pointer, slot);
+    }
+
+    public boolean cancelMorph() {
+        return cancelMorph_native(pointer);
+    }
+
+    public boolean cancelResearch() {
+        return cancelResearch_native(pointer);
+    }
+
+    public boolean cancelUpgrade() {
+        return cancelUpgrade_native(pointer);
+    }
+
+    public boolean useTech(TechType tech) {
+        return useTech_native(pointer, tech);
+    }
+
+    public boolean useTech(TechType tech, PositionOrUnit target) {
+        return useTech_native(pointer, tech, target);
+    }
+
+
+    private static Map<Long, Unitset> instances = new HashMap<Long, Unitset>();
+
+    private Unitset(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static Unitset get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        Unitset instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new Unitset(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native Position getPosition_native(long pointer);
+
+    private native List<Unit> getLoadedUnits_native(long pointer);
+
+    private native List<Unit> getInterceptors_native(long pointer);
+
+    private native List<Unit> getLarva_native(long pointer);
+
+    private native boolean issueCommand_native(long pointer, UnitCommand command);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target);
+
+    private native boolean attack_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean build_native(long pointer, UnitType type);
+
+    private native boolean build_native(long pointer, UnitType type, TilePosition target);
+
+    private native boolean buildAddon_native(long pointer, UnitType type);
+
+    private native boolean train_native(long pointer, UnitType type);
+
+    private native boolean morph_native(long pointer, UnitType type);
+
+    private native boolean setRallyPoint_native(long pointer, PositionOrUnit target);
+
+    private native boolean move_native(long pointer, Position target);
+
+    private native boolean move_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean patrol_native(long pointer, Position target);
+
+    private native boolean patrol_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean holdPosition_native(long pointer);
+
+    private native boolean holdPosition_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean stop_native(long pointer);
+
+    private native boolean stop_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean follow_native(long pointer, Unit target);
+
+    private native boolean follow_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean gather_native(long pointer, Unit target);
+
+    private native boolean gather_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean returnCargo_native(long pointer);
+
+    private native boolean returnCargo_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean repair_native(long pointer, Unit target);
+
+    private native boolean repair_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean burrow_native(long pointer);
+
+    private native boolean unburrow_native(long pointer);
+
+    private native boolean cloak_native(long pointer);
+
+    private native boolean decloak_native(long pointer);
+
+    private native boolean siege_native(long pointer);
+
+    private native boolean unsiege_native(long pointer);
+
+    private native boolean lift_native(long pointer);
+
+    private native boolean load_native(long pointer, Unit target);
+
+    private native boolean load_native(long pointer, Unit target, boolean shiftQueueCommand);
+
+    private native boolean unloadAll_native(long pointer);
+
+    private native boolean unloadAll_native(long pointer, boolean shiftQueueCommand);
+
+    private native boolean unloadAll_native(long pointer, Position target);
+
+    private native boolean unloadAll_native(long pointer, Position target, boolean shiftQueueCommand);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target);
+
+    private native boolean rightClick_native(long pointer, PositionOrUnit target, boolean shiftQueueCommand);
+
+    private native boolean haltConstruction_native(long pointer);
+
+    private native boolean cancelConstruction_native(long pointer);
+
+    private native boolean cancelAddon_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer);
+
+    private native boolean cancelTrain_native(long pointer, int slot);
+
+    private native boolean cancelMorph_native(long pointer);
+
+    private native boolean cancelResearch_native(long pointer);
+
+    private native boolean cancelUpgrade_native(long pointer);
+
+    private native boolean useTech_native(long pointer, TechType tech);
+
+    private native boolean useTech_native(long pointer, TechType tech, PositionOrUnit target);
+
+
+}
diff --git a/generated/bwapi4/UpgradeType.java b/generated/bwapi4/UpgradeType.java
new file mode 100644
index 0000000..0d1e163
--- /dev/null
+++ b/generated/bwapi4/UpgradeType.java
@@ -0,0 +1,230 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class UpgradeType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public Race getRace() {
+        return getRace_native(pointer);
+    }
+
+    public int mineralPrice() {
+        return mineralPrice_native(pointer);
+    }
+
+    public int mineralPrice(int level) {
+        return mineralPrice_native(pointer, level);
+    }
+
+    public int mineralPriceFactor() {
+        return mineralPriceFactor_native(pointer);
+    }
+
+    public int gasPrice() {
+        return gasPrice_native(pointer);
+    }
+
+    public int gasPrice(int level) {
+        return gasPrice_native(pointer, level);
+    }
+
+    public int gasPriceFactor() {
+        return gasPriceFactor_native(pointer);
+    }
+
+    public int upgradeTime() {
+        return upgradeTime_native(pointer);
+    }
+
+    public int upgradeTime(int level) {
+        return upgradeTime_native(pointer, level);
+    }
+
+    public int upgradeTimeFactor() {
+        return upgradeTimeFactor_native(pointer);
+    }
+
+    public int maxRepeats() {
+        return maxRepeats_native(pointer);
+    }
+
+    public UnitType whatUpgrades() {
+        return whatUpgrades_native(pointer);
+    }
+
+    public UnitType whatsRequired() {
+        return whatsRequired_native(pointer);
+    }
+
+    public UnitType whatsRequired(int level) {
+        return whatsRequired_native(pointer, level);
+    }
+
+    public static UpgradeType Terran_Infantry_Armor;
+
+    public static UpgradeType Terran_Vehicle_Plating;
+
+    public static UpgradeType Terran_Ship_Plating;
+
+    public static UpgradeType Zerg_Carapace;
+
+    public static UpgradeType Zerg_Flyer_Carapace;
+
+    public static UpgradeType Protoss_Ground_Armor;
+
+    public static UpgradeType Protoss_Air_Armor;
+
+    public static UpgradeType Terran_Infantry_Weapons;
+
+    public static UpgradeType Terran_Vehicle_Weapons;
+
+    public static UpgradeType Terran_Ship_Weapons;
+
+    public static UpgradeType Zerg_Melee_Attacks;
+
+    public static UpgradeType Zerg_Missile_Attacks;
+
+    public static UpgradeType Zerg_Flyer_Attacks;
+
+    public static UpgradeType Protoss_Ground_Weapons;
+
+    public static UpgradeType Protoss_Air_Weapons;
+
+    public static UpgradeType Protoss_Plasma_Shields;
+
+    public static UpgradeType U_238_Shells;
+
+    public static UpgradeType Ion_Thrusters;
+
+    public static UpgradeType Titan_Reactor;
+
+    public static UpgradeType Ocular_Implants;
+
+    public static UpgradeType Moebius_Reactor;
+
+    public static UpgradeType Apollo_Reactor;
+
+    public static UpgradeType Colossus_Reactor;
+
+    public static UpgradeType Ventral_Sacs;
+
+    public static UpgradeType Antennae;
+
+    public static UpgradeType Pneumatized_Carapace;
+
+    public static UpgradeType Metabolic_Boost;
+
+    public static UpgradeType Adrenal_Glands;
+
+    public static UpgradeType Muscular_Augments;
+
+    public static UpgradeType Grooved_Spines;
+
+    public static UpgradeType Gamete_Meiosis;
+
+    public static UpgradeType Metasynaptic_Node;
+
+    public static UpgradeType Singularity_Charge;
+
+    public static UpgradeType Leg_Enhancements;
+
+    public static UpgradeType Scarab_Damage;
+
+    public static UpgradeType Reaver_Capacity;
+
+    public static UpgradeType Gravitic_Drive;
+
+    public static UpgradeType Sensor_Array;
+
+    public static UpgradeType Gravitic_Boosters;
+
+    public static UpgradeType Khaydarin_Amulet;
+
+    public static UpgradeType Apial_Sensors;
+
+    public static UpgradeType Gravitic_Thrusters;
+
+    public static UpgradeType Carrier_Capacity;
+
+    public static UpgradeType Khaydarin_Core;
+
+    public static UpgradeType Argus_Jewel;
+
+    public static UpgradeType Argus_Talisman;
+
+    public static UpgradeType Caduceus_Reactor;
+
+    public static UpgradeType Chitinous_Plating;
+
+    public static UpgradeType Anabolic_Synthesis;
+
+    public static UpgradeType Charon_Boosters;
+
+    public static UpgradeType Upgrade_60;
+
+    public static UpgradeType None;
+
+    public static UpgradeType Unknown;
+
+
+    private static Map<Long, UpgradeType> instances = new HashMap<Long, UpgradeType>();
+
+    private UpgradeType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static UpgradeType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        UpgradeType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new UpgradeType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native Race getRace_native(long pointer);
+
+    private native int mineralPrice_native(long pointer);
+
+    private native int mineralPrice_native(long pointer, int level);
+
+    private native int mineralPriceFactor_native(long pointer);
+
+    private native int gasPrice_native(long pointer);
+
+    private native int gasPrice_native(long pointer, int level);
+
+    private native int gasPriceFactor_native(long pointer);
+
+    private native int upgradeTime_native(long pointer);
+
+    private native int upgradeTime_native(long pointer, int level);
+
+    private native int upgradeTimeFactor_native(long pointer);
+
+    private native int maxRepeats_native(long pointer);
+
+    private native UnitType whatUpgrades_native(long pointer);
+
+    private native UnitType whatsRequired_native(long pointer);
+
+    private native UnitType whatsRequired_native(long pointer, int level);
+
+
+}
diff --git a/generated/bwapi4/Utils.java b/generated/bwapi4/Utils.java
new file mode 100644
index 0000000..1a6154c
--- /dev/null
+++ b/generated/bwapi4/Utils.java
@@ -0,0 +1,52 @@
+package bwapi4;
+
+import java.lang.String;
+import java.lang.System;
+
+/**
+ *
+ */
+public class Utils {
+
+    public static final byte Previous = 0x01;
+    public static final byte Cyan = 0x02;
+    public static final byte Yellow = 0x03;
+    public static final byte White = 0x04;
+    public static final byte Grey = 0x05;
+    public static final byte Red = 0x06;
+    public static final byte Green = 0x07;
+    public static final byte Red_P1 = 0x08;
+    public static final byte Tab = 0x09;
+    public static final byte Newline = 0x0A;
+    public static final byte Invisible_no_override = 0x0B;
+    public static final byte Remove_beyond = 0x0C;
+    public static final byte Clear_formatting = 0x0D;
+    public static final byte Blue = 0x0E;
+    public static final byte Teal = 0x0F;
+    public static final byte Purple = 0x10;
+    public static final byte Orange = 0x11;
+    public static final byte Right_Align = 0x12;
+    public static final byte Center_Align = 0x13;
+    public static final byte Invisible = 0x14;
+    public static final byte Brown = 0x15;
+    public static final byte White_p7 = 0x16;
+    public static final byte Yellow_p8 = 0x17;
+    public static final byte Green_p9 = 0x18;
+    public static final byte Brighter_Yellow = 0x19;
+    public static final byte Cyan_default = 0x1A;
+    public static final byte Pinkish = 0x1B;
+    public static final byte Dark_Cyan = 0x1C;
+    public static final byte Greygreen = 0x1D;
+    public static final byte Bluegrey = 0x1E;
+    public static final byte Turquoise = 0x1F;
+
+    public static String formatText(String text, byte format){
+        byte[] textData = text.getBytes();
+        int textDataLength = text.length();
+
+        byte[] newTextData = new byte[textDataLength + 1];
+        newTextData[0] = format;
+        System.arraycopy(textData, 0, newTextData, 1, textDataLength);
+        return new String(newTextData);
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/WalkPosition.java b/generated/bwapi4/WalkPosition.java
new file mode 100644
index 0000000..78e437f
--- /dev/null
+++ b/generated/bwapi4/WalkPosition.java
@@ -0,0 +1,83 @@
+package bwapi4;
+
+import java.lang.Override;
+import java.util.HashMap;
+import java.util.Map;
+
+public class WalkPosition extends AbstractPoint<WalkPosition>{
+
+    private int x, y;
+
+    public WalkPosition(int x, int y) {
+        this.x = x;
+        this.y = y;
+    }
+
+    public String toString() {
+        return "[" + x + ", " + y + "]";
+    }
+
+    public native boolean isValid();
+
+    public native WalkPosition makeValid();
+
+    public native int getApproxDistance(WalkPosition position);
+
+    public native double getLength();
+
+    public int getX() {
+        return x;
+    }
+
+    public int getY() {
+        return y;
+    }
+
+    public static WalkPosition Invalid;
+
+    public static WalkPosition None;
+
+    public static WalkPosition Unknown;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (!(o instanceof WalkPosition)) return false;
+
+        WalkPosition position = (WalkPosition) o;
+
+        if (x != position.x) return false;
+        if (y != position.y) return false;
+
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = x;
+        result = 31 * result + y;
+        return result;
+    }
+
+
+    private static Map<Long, WalkPosition> instances = new HashMap<Long, WalkPosition>();
+
+    private WalkPosition(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static WalkPosition get(long pointer) {
+        WalkPosition instance = instances.get(pointer);
+        if (instance == null) {
+            instance = new WalkPosition(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    public WalkPosition getPoint(){
+        return this;
+    }
+}
\ No newline at end of file
diff --git a/generated/bwapi4/WeaponType.java b/generated/bwapi4/WeaponType.java
new file mode 100644
index 0000000..edc5079
--- /dev/null
+++ b/generated/bwapi4/WeaponType.java
@@ -0,0 +1,382 @@
+package bwapi4;
+
+import bwapi4.*;
+
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collection;
+import java.util.List;
+
+public class WeaponType {
+
+    public String toString() {
+        return toString_native(pointer);
+    }
+
+    public TechType getTech() {
+        return getTech_native(pointer);
+    }
+
+    public UnitType whatUses() {
+        return whatUses_native(pointer);
+    }
+
+    public int damageAmount() {
+        return damageAmount_native(pointer);
+    }
+
+    public int damageBonus() {
+        return damageBonus_native(pointer);
+    }
+
+    public int damageCooldown() {
+        return damageCooldown_native(pointer);
+    }
+
+    public int damageFactor() {
+        return damageFactor_native(pointer);
+    }
+
+    public UpgradeType upgradeType() {
+        return upgradeType_native(pointer);
+    }
+
+    public DamageType damageType() {
+        return damageType_native(pointer);
+    }
+
+    public ExplosionType explosionType() {
+        return explosionType_native(pointer);
+    }
+
+    public int minRange() {
+        return minRange_native(pointer);
+    }
+
+    public int maxRange() {
+        return maxRange_native(pointer);
+    }
+
+    public int innerSplashRadius() {
+        return innerSplashRadius_native(pointer);
+    }
+
+    public int medianSplashRadius() {
+        return medianSplashRadius_native(pointer);
+    }
+
+    public int outerSplashRadius() {
+        return outerSplashRadius_native(pointer);
+    }
+
+    public boolean targetsAir() {
+        return targetsAir_native(pointer);
+    }
+
+    public boolean targetsGround() {
+        return targetsGround_native(pointer);
+    }
+
+    public boolean targetsMechanical() {
+        return targetsMechanical_native(pointer);
+    }
+
+    public boolean targetsOrganic() {
+        return targetsOrganic_native(pointer);
+    }
+
+    public boolean targetsNonBuilding() {
+        return targetsNonBuilding_native(pointer);
+    }
+
+    public boolean targetsNonRobotic() {
+        return targetsNonRobotic_native(pointer);
+    }
+
+    public boolean targetsTerrain() {
+        return targetsTerrain_native(pointer);
+    }
+
+    public boolean targetsOrgOrMech() {
+        return targetsOrgOrMech_native(pointer);
+    }
+
+    public boolean targetsOwn() {
+        return targetsOwn_native(pointer);
+    }
+
+    public static WeaponType Gauss_Rifle;
+
+    public static WeaponType Gauss_Rifle_Jim_Raynor;
+
+    public static WeaponType C_10_Canister_Rifle;
+
+    public static WeaponType C_10_Canister_Rifle_Sarah_Kerrigan;
+
+    public static WeaponType C_10_Canister_Rifle_Samir_Duran;
+
+    public static WeaponType C_10_Canister_Rifle_Infested_Duran;
+
+    public static WeaponType C_10_Canister_Rifle_Alexei_Stukov;
+
+    public static WeaponType Fragmentation_Grenade;
+
+    public static WeaponType Fragmentation_Grenade_Jim_Raynor;
+
+    public static WeaponType Spider_Mines;
+
+    public static WeaponType Twin_Autocannons;
+
+    public static WeaponType Twin_Autocannons_Alan_Schezar;
+
+    public static WeaponType Hellfire_Missile_Pack;
+
+    public static WeaponType Hellfire_Missile_Pack_Alan_Schezar;
+
+    public static WeaponType Arclite_Cannon;
+
+    public static WeaponType Arclite_Cannon_Edmund_Duke;
+
+    public static WeaponType Fusion_Cutter;
+
+    public static WeaponType Gemini_Missiles;
+
+    public static WeaponType Gemini_Missiles_Tom_Kazansky;
+
+    public static WeaponType Burst_Lasers;
+
+    public static WeaponType Burst_Lasers_Tom_Kazansky;
+
+    public static WeaponType ATS_Laser_Battery;
+
+    public static WeaponType ATS_Laser_Battery_Hero;
+
+    public static WeaponType ATS_Laser_Battery_Hyperion;
+
+    public static WeaponType ATA_Laser_Battery;
+
+    public static WeaponType ATA_Laser_Battery_Hero;
+
+    public static WeaponType ATA_Laser_Battery_Hyperion;
+
+    public static WeaponType Flame_Thrower;
+
+    public static WeaponType Flame_Thrower_Gui_Montag;
+
+    public static WeaponType Arclite_Shock_Cannon;
+
+    public static WeaponType Arclite_Shock_Cannon_Edmund_Duke;
+
+    public static WeaponType Longbolt_Missile;
+
+    public static WeaponType Claws;
+
+    public static WeaponType Claws_Devouring_One;
+
+    public static WeaponType Claws_Infested_Kerrigan;
+
+    public static WeaponType Needle_Spines;
+
+    public static WeaponType Needle_Spines_Hunter_Killer;
+
+    public static WeaponType Kaiser_Blades;
+
+    public static WeaponType Kaiser_Blades_Torrasque;
+
+    public static WeaponType Toxic_Spores;
+
+    public static WeaponType Spines;
+
+    public static WeaponType Acid_Spore;
+
+    public static WeaponType Acid_Spore_Kukulza;
+
+    public static WeaponType Glave_Wurm;
+
+    public static WeaponType Glave_Wurm_Kukulza;
+
+    public static WeaponType Seeker_Spores;
+
+    public static WeaponType Subterranean_Tentacle;
+
+    public static WeaponType Suicide_Infested_Terran;
+
+    public static WeaponType Suicide_Scourge;
+
+    public static WeaponType Particle_Beam;
+
+    public static WeaponType Psi_Blades;
+
+    public static WeaponType Psi_Blades_Fenix;
+
+    public static WeaponType Phase_Disruptor;
+
+    public static WeaponType Phase_Disruptor_Fenix;
+
+    public static WeaponType Psi_Assault;
+
+    public static WeaponType Psionic_Shockwave;
+
+    public static WeaponType Psionic_Shockwave_TZ_Archon;
+
+    public static WeaponType Dual_Photon_Blasters;
+
+    public static WeaponType Dual_Photon_Blasters_Mojo;
+
+    public static WeaponType Dual_Photon_Blasters_Artanis;
+
+    public static WeaponType Anti_Matter_Missiles;
+
+    public static WeaponType Anti_Matter_Missiles_Mojo;
+
+    public static WeaponType Anti_Matter_Missiles_Artanis;
+
+    public static WeaponType Phase_Disruptor_Cannon;
+
+    public static WeaponType Phase_Disruptor_Cannon_Danimoth;
+
+    public static WeaponType Pulse_Cannon;
+
+    public static WeaponType STS_Photon_Cannon;
+
+    public static WeaponType STA_Photon_Cannon;
+
+    public static WeaponType Scarab;
+
+    public static WeaponType Neutron_Flare;
+
+    public static WeaponType Halo_Rockets;
+
+    public static WeaponType Corrosive_Acid;
+
+    public static WeaponType Subterranean_Spines;
+
+    public static WeaponType Warp_Blades;
+
+    public static WeaponType Warp_Blades_Hero;
+
+    public static WeaponType Warp_Blades_Zeratul;
+
+    public static WeaponType Independant_Laser_Battery;
+
+    public static WeaponType Twin_Autocannons_Floor_Trap;
+
+    public static WeaponType Hellfire_Missile_Pack_Wall_Trap;
+
+    public static WeaponType Flame_Thrower_Wall_Trap;
+
+    public static WeaponType Hellfire_Missile_Pack_Floor_Trap;
+
+    public static WeaponType Yamato_Gun;
+
+    public static WeaponType Nuclear_Strike;
+
+    public static WeaponType Lockdown;
+
+    public static WeaponType EMP_Shockwave;
+
+    public static WeaponType Irradiate;
+
+    public static WeaponType Parasite;
+
+    public static WeaponType Spawn_Broodlings;
+
+    public static WeaponType Ensnare;
+
+    public static WeaponType Dark_Swarm;
+
+    public static WeaponType Plague;
+
+    public static WeaponType Consume;
+
+    public static WeaponType Stasis_Field;
+
+    public static WeaponType Psionic_Storm;
+
+    public static WeaponType Disruption_Web;
+
+    public static WeaponType Restoration;
+
+    public static WeaponType Mind_Control;
+
+    public static WeaponType Feedback;
+
+    public static WeaponType Optical_Flare;
+
+    public static WeaponType Maelstrom;
+
+    public static WeaponType None;
+
+    public static WeaponType Unknown;
+
+
+    private static Map<Long, WeaponType> instances = new HashMap<Long, WeaponType>();
+
+    private WeaponType(long pointer) {
+        this.pointer = pointer;
+    }
+
+    private static WeaponType get(long pointer) {
+        if (pointer == 0 ) {
+            return null;
+        }
+        WeaponType instance = instances.get(pointer);
+        if (instance == null ) {
+            instance = new WeaponType(pointer);
+            instances.put(pointer, instance);
+        }
+        return instance;
+    }
+
+    private long pointer;
+
+    private native String toString_native(long pointer);
+
+    private native TechType getTech_native(long pointer);
+
+    private native UnitType whatUses_native(long pointer);
+
+    private native int damageAmount_native(long pointer);
+
+    private native int damageBonus_native(long pointer);
+
+    private native int damageCooldown_native(long pointer);
+
+    private native int damageFactor_native(long pointer);
+
+    private native UpgradeType upgradeType_native(long pointer);
+
+    private native DamageType damageType_native(long pointer);
+
+    private native ExplosionType explosionType_native(long pointer);
+
+    private native int minRange_native(long pointer);
+
+    private native int maxRange_native(long pointer);
+
+    private native int innerSplashRadius_native(long pointer);
+
+    private native int medianSplashRadius_native(long pointer);
+
+    private native int outerSplashRadius_native(long pointer);
+
+    private native boolean targetsAir_native(long pointer);
+
+    private native boolean targetsGround_native(long pointer);
+
+    private native boolean targetsMechanical_native(long pointer);
+
+    private native boolean targetsOrganic_native(long pointer);
+
+    private native boolean targetsNonBuilding_native(long pointer);
+
+    private native boolean targetsNonRobotic_native(long pointer);
+
+    private native boolean targetsTerrain_native(long pointer);
+
+    private native boolean targetsOrgOrMech_native(long pointer);
+
+    private native boolean targetsOwn_native(long pointer);
+
+
+}
diff --git a/headers4/bwapi4_Position.h b/headers4/bwapi4_Position.h
index 0c71c53..46acd64 100644
--- a/headers4/bwapi4_Position.h
+++ b/headers4/bwapi4_Position.h
@@ -23,14 +23,6 @@ JNIEXPORT jboolean JNICALL Java_bwapi4_Position_isValid
 JNIEXPORT jobject JNICALL Java_bwapi4_Position_makeValid
   (JNIEnv *, jobject);
 
-/*
- * Class:     bwapi4_Position
- * Method:    getDistance
- * Signature: (Lbwapi4/Position;)D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_Position_getDistance
-  (JNIEnv *, jobject, jobject);
-
 /*
  * Class:     bwapi4_Position
  * Method:    getApproxDistance
diff --git a/headers4/bwapi4_TilePosition.h b/headers4/bwapi4_TilePosition.h
index 982f3a0..32a3dbe 100644
--- a/headers4/bwapi4_TilePosition.h
+++ b/headers4/bwapi4_TilePosition.h
@@ -23,14 +23,6 @@ JNIEXPORT jboolean JNICALL Java_bwapi4_TilePosition_isValid
 JNIEXPORT jobject JNICALL Java_bwapi4_TilePosition_makeValid
   (JNIEnv *, jobject);
 
-/*
- * Class:     bwapi4_TilePosition
- * Method:    getDistance
- * Signature: (Lbwapi4/TilePosition;)D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_TilePosition_getDistance
-  (JNIEnv *, jobject, jobject);
-
 /*
  * Class:     bwapi4_TilePosition
  * Method:    getLength
diff --git a/headers4/bwapi4_WalkPosition.h b/headers4/bwapi4_WalkPosition.h
index bb41010..66292a1 100644
--- a/headers4/bwapi4_WalkPosition.h
+++ b/headers4/bwapi4_WalkPosition.h
@@ -23,14 +23,6 @@ JNIEXPORT jboolean JNICALL Java_bwapi4_WalkPosition_isValid
 JNIEXPORT jobject JNICALL Java_bwapi4_WalkPosition_makeValid
   (JNIEnv *, jobject);
 
-/*
- * Class:     bwapi4_WalkPosition
- * Method:    getDistance
- * Signature: (Lbwapi4/WalkPosition;)D
- */
-JNIEXPORT jdouble JNICALL Java_bwapi4_WalkPosition_getDistance
-  (JNIEnv *, jobject, jobject);
-
 /*
  * Class:     bwapi4_WalkPosition
  * Method:    getApproxDistance
diff --git a/headers4/bwapi_AIModule.h b/headers4/bwapi_AIModule.h
new file mode 100644
index 0000000..764de38
--- /dev/null
+++ b/headers4/bwapi_AIModule.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_AIModule */
+
+#ifndef _Included_bwapi_AIModule
+#define _Included_bwapi_AIModule
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_AbstractPoint.h b/headers4/bwapi_AbstractPoint.h
new file mode 100644
index 0000000..4d5fedb
--- /dev/null
+++ b/headers4/bwapi_AbstractPoint.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_AbstractPoint */
+
+#ifndef _Included_bwapi_AbstractPoint
+#define _Included_bwapi_AbstractPoint
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_BWEventListener.h b/headers4/bwapi_BWEventListener.h
new file mode 100644
index 0000000..363fd55
--- /dev/null
+++ b/headers4/bwapi_BWEventListener.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_BWEventListener */
+
+#ifndef _Included_bwapi_BWEventListener
+#define _Included_bwapi_BWEventListener
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_BestFilter.h b/headers4/bwapi_BestFilter.h
new file mode 100644
index 0000000..a68b0d3
--- /dev/null
+++ b/headers4/bwapi_BestFilter.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_BestFilter */
+
+#ifndef _Included_bwapi_BestFilter
+#define _Included_bwapi_BestFilter
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_BestUnitFilter.h b/headers4/bwapi_BestUnitFilter.h
new file mode 100644
index 0000000..7367aa1
--- /dev/null
+++ b/headers4/bwapi_BestUnitFilter.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_BestUnitFilter */
+
+#ifndef _Included_bwapi_BestUnitFilter
+#define _Included_bwapi_BestUnitFilter
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Bullet.h b/headers4/bwapi_Bullet.h
new file mode 100644
index 0000000..0ac7648
--- /dev/null
+++ b/headers4/bwapi_Bullet.h
@@ -0,0 +1,125 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Bullet */
+
+#ifndef _Included_bwapi_Bullet
+#define _Included_bwapi_Bullet
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getID_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Bullet_getID_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    exists_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_exists_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getPlayer_native
+ * Signature: (J)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getPlayer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getType_native
+ * Signature: (J)Lbwapi/BulletType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getSource_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getSource_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getAngle_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getAngle_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getVelocityX_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getVelocityX_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getVelocityY_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Bullet_getVelocityY_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getTarget_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getTarget_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getTargetPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Bullet_getTargetPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    getRemoveTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Bullet_getRemoveTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    isVisible_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_isVisible_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Bullet
+ * Method:    isVisible_native
+ * Signature: (JLbwapi/Player;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Bullet_isVisible_1native__JLbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_BulletType.h b/headers4/bwapi_BulletType.h
new file mode 100644
index 0000000..1da946b
--- /dev/null
+++ b/headers4/bwapi_BulletType.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_BulletType */
+
+#ifndef _Included_bwapi_BulletType
+#define _Included_bwapi_BulletType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_BulletType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_BulletType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Bulletset.h b/headers4/bwapi_Bulletset.h
new file mode 100644
index 0000000..eeaa327
--- /dev/null
+++ b/headers4/bwapi_Bulletset.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Bulletset */
+
+#ifndef _Included_bwapi_Bulletset
+#define _Included_bwapi_Bulletset
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_CenteredObject.h b/headers4/bwapi_CenteredObject.h
new file mode 100644
index 0000000..b82217e
--- /dev/null
+++ b/headers4/bwapi_CenteredObject.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_CenteredObject */
+
+#ifndef _Included_bwapi_CenteredObject
+#define _Included_bwapi_CenteredObject
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Client.h b/headers4/bwapi_Client.h
new file mode 100644
index 0000000..b339640
--- /dev/null
+++ b/headers4/bwapi_Client.h
@@ -0,0 +1,45 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Client */
+
+#ifndef _Included_bwapi_Client
+#define _Included_bwapi_Client
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Client
+ * Method:    isConnected_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Client_isConnected_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Client
+ * Method:    connect_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Client_connect_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Client
+ * Method:    disconnect_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Client_disconnect_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Client
+ * Method:    update_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Client_update_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Color.h b/headers4/bwapi_Color.h
new file mode 100644
index 0000000..a274c6c
--- /dev/null
+++ b/headers4/bwapi_Color.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Color */
+
+#ifndef _Included_bwapi_Color
+#define _Included_bwapi_Color
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_CompareFilter.h b/headers4/bwapi_CompareFilter.h
new file mode 100644
index 0000000..baf236c
--- /dev/null
+++ b/headers4/bwapi_CompareFilter.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_CompareFilter */
+
+#ifndef _Included_bwapi_CompareFilter
+#define _Included_bwapi_CompareFilter
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_DamageType.h b/headers4/bwapi_DamageType.h
new file mode 100644
index 0000000..56b127f
--- /dev/null
+++ b/headers4/bwapi_DamageType.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_DamageType */
+
+#ifndef _Included_bwapi_DamageType
+#define _Included_bwapi_DamageType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_DamageType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_DamageType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_DefaultBWListener.h b/headers4/bwapi_DefaultBWListener.h
new file mode 100644
index 0000000..5acdc5d
--- /dev/null
+++ b/headers4/bwapi_DefaultBWListener.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_DefaultBWListener */
+
+#ifndef _Included_bwapi_DefaultBWListener
+#define _Included_bwapi_DefaultBWListener
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Error.h b/headers4/bwapi_Error.h
new file mode 100644
index 0000000..101a054
--- /dev/null
+++ b/headers4/bwapi_Error.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Error */
+
+#ifndef _Included_bwapi_Error
+#define _Included_bwapi_Error
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Error
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Error_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Event.h b/headers4/bwapi_Event.h
new file mode 100644
index 0000000..2e65bc3
--- /dev/null
+++ b/headers4/bwapi_Event.h
@@ -0,0 +1,53 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Event */
+
+#ifndef _Included_bwapi_Event
+#define _Included_bwapi_Event
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Event
+ * Method:    getPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Event
+ * Method:    getText_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Event_getText_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Event
+ * Method:    getUnit_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getUnit_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Event
+ * Method:    getPlayer_native
+ * Signature: (J)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Event_getPlayer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Event
+ * Method:    isWinner_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Event_isWinner_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_ExplosionType.h b/headers4/bwapi_ExplosionType.h
new file mode 100644
index 0000000..f97ed24
--- /dev/null
+++ b/headers4/bwapi_ExplosionType.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_ExplosionType */
+
+#ifndef _Included_bwapi_ExplosionType
+#define _Included_bwapi_ExplosionType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_ExplosionType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_ExplosionType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Force.h b/headers4/bwapi_Force.h
new file mode 100644
index 0000000..fa883e5
--- /dev/null
+++ b/headers4/bwapi_Force.h
@@ -0,0 +1,37 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Force */
+
+#ifndef _Included_bwapi_Force
+#define _Included_bwapi_Force
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Force
+ * Method:    getID_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Force_getID_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Force
+ * Method:    getName_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Force_getName_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Force
+ * Method:    getPlayers_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Force_getPlayers_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Forceset.h b/headers4/bwapi_Forceset.h
new file mode 100644
index 0000000..99d21d4
--- /dev/null
+++ b/headers4/bwapi_Forceset.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Forceset */
+
+#ifndef _Included_bwapi_Forceset
+#define _Included_bwapi_Forceset
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Forceset
+ * Method:    getPlayers_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Forceset_getPlayers_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Game.h b/headers4/bwapi_Game.h
new file mode 100644
index 0000000..bf4a6a3
--- /dev/null
+++ b/headers4/bwapi_Game.h
@@ -0,0 +1,1741 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Game */
+
+#ifndef _Included_bwapi_Game
+#define _Included_bwapi_Game
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Game
+ * Method:    getForces_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getForces_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getPlayers_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getPlayers_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getAllUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getAllUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getMinerals_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getGeysers_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getGeysers_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getNeutralUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getNeutralUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getStaticMinerals_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getStaticGeysers_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticGeysers_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getStaticNeutralUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getStaticNeutralUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getBullets_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBullets_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getForce_native
+ * Signature: (JI)Lbwapi/Force;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getForce_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getPlayer_native
+ * Signature: (JI)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getPlayer_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getUnit_native
+ * Signature: (JI)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getUnit_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    indexToUnit_native
+ * Signature: (JI)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_indexToUnit_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getRegion_native
+ * Signature: (JI)Lbwapi/Region;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegion_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getGameType_native
+ * Signature: (J)Lbwapi/GameType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getGameType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getLatency_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatency_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getFrameCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getFrameCount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getReplayFrameCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getReplayFrameCount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getFPS_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getFPS_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getAverageFPS_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Game_getAverageFPS_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getMousePosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getMousePosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getMouseState_native
+ * Signature: (JLbwapi/MouseButton;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_getMouseState_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getKeyState_native
+ * Signature: (JLbwapi/Key;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_getKeyState_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getScreenPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getScreenPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setScreenPosition_native
+ * Signature: (JII)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setScreenPosition_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setScreenPosition_native
+ * Signature: (JLbwapi/Position;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setScreenPosition_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    pingMinimap_native
+ * Signature: (JII)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_pingMinimap_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    pingMinimap_native
+ * Signature: (JLbwapi/Position;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_pingMinimap_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isFlagEnabled_native
+ * Signature: (JI)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isFlagEnabled_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    enableFlag_native
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_enableFlag_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getLastError_native
+ * Signature: (J)Lbwapi/Error;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getLastError_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setLastError_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setLastError_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setLastError_native
+ * Signature: (JLbwapi/Error;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setLastError_1native__JLbwapi_Error_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    mapWidth_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_mapWidth_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    mapHeight_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_mapHeight_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    mapFileName_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapFileName_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    mapPathName_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapPathName_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    mapName_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapName_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    mapHash_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Game_mapHash_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isWalkable_native
+ * Signature: (JII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isWalkable_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isWalkable_native
+ * Signature: (JLbwapi/WalkPosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isWalkable_1native__JLbwapi_WalkPosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getGroundHeight_native
+ * Signature: (JII)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getGroundHeight_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getGroundHeight_native
+ * Signature: (JLbwapi/TilePosition;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getGroundHeight_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isBuildable_native
+ * Signature: (JII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isBuildable_native
+ * Signature: (JIIZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JIIZ
+  (JNIEnv *, jobject, jlong, jint, jint, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isBuildable_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isBuildable_native
+ * Signature: (JLbwapi/TilePosition;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBuildable_1native__JLbwapi_TilePosition_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isVisible_native
+ * Signature: (JII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isVisible_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isVisible_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isVisible_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isExplored_native
+ * Signature: (JII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isExplored_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isExplored_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isExplored_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasCreep_native
+ * Signature: (JII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasCreep_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasCreep_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasCreep_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPowerPrecise_native
+ * Signature: (JII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPowerPrecise_native
+ * Signature: (JIILbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JIILbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPowerPrecise_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPowerPrecise_native
+ * Signature: (JLbwapi/Position;Lbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPowerPrecise_1native__JLbwapi_Position_2Lbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JIILbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIILbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JIIII)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIIII
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JIIIILbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JIIIILbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JLbwapi/TilePosition;II)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2II
+  (JNIEnv *, jobject, jlong, jobject, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPower_native
+ * Signature: (JLbwapi/TilePosition;IILbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPower_1native__JLbwapi_TilePosition_2IILbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canBuildHere_native
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;Lbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2Lbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canBuildHere_native
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canBuildHere_native
+ * Signature: (JLbwapi/TilePosition;Lbwapi/UnitType;Lbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canBuildHere_1native__JLbwapi_TilePosition_2Lbwapi_UnitType_2Lbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canMake_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canMake_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canMake_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canMake_1native__JLbwapi_UnitType_2Lbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canResearch_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2Lbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canResearch_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canResearch_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canResearch_1native__JLbwapi_TechType_2Lbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canUpgrade_native
+ * Signature: (JLbwapi/UpgradeType;Lbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2Lbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canUpgrade_native
+ * Signature: (JLbwapi/UpgradeType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    canUpgrade_native
+ * Signature: (JLbwapi/UpgradeType;Lbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_canUpgrade_1native__JLbwapi_UpgradeType_2Lbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    printf_native
+ * Signature: (JLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_printf_1native
+  (JNIEnv *, jobject, jlong, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    sendText_native
+ * Signature: (JLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_sendText_1native
+  (JNIEnv *, jobject, jlong, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    sendTextEx_native
+ * Signature: (JZLjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_sendTextEx_1native
+  (JNIEnv *, jobject, jlong, jboolean, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isInGame_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isInGame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isMultiplayer_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isMultiplayer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isBattleNet_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isBattleNet_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isPaused_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isPaused_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isReplay_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isReplay_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    pauseGame_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_pauseGame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    resumeGame_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_resumeGame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    leaveGame_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_leaveGame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    restartGame_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_restartGame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setLocalSpeed_native
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setLocalSpeed_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    issueCommand_native
+ * Signature: (JLjava/util/List;Lbwapi/UnitCommand;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_issueCommand_1native
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getSelectedUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getSelectedUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    self_native
+ * Signature: (J)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_self_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    enemy_native
+ * Signature: (J)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_enemy_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    neutral_native
+ * Signature: (J)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_neutral_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    allies_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_allies_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    enemies_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_enemies_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    observers_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_observers_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setTextSize_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setTextSize_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setTextSize_native
+ * Signature: (JLbwapi/Text/Size/Enum;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setTextSize_1native__JLbwapi_Text_Size_Enum_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawText_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawText_1native
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTextMap_native
+ * Signature: (JIILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMap_1native__JIILjava_lang_String_2
+  (JNIEnv *, jobject, jlong, jint, jint, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTextMap_native
+ * Signature: (JLbwapi/Position;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMap_1native__JLbwapi_Position_2Ljava_lang_String_2
+  (JNIEnv *, jobject, jlong, jobject, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTextMouse_native
+ * Signature: (JIILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMouse_1native__JIILjava_lang_String_2
+  (JNIEnv *, jobject, jlong, jint, jint, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTextMouse_native
+ * Signature: (JLbwapi/Position;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextMouse_1native__JLbwapi_Position_2Ljava_lang_String_2
+  (JNIEnv *, jobject, jlong, jobject, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTextScreen_native
+ * Signature: (JIILjava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextScreen_1native__JIILjava_lang_String_2
+  (JNIEnv *, jobject, jlong, jint, jint, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTextScreen_native
+ * Signature: (JLbwapi/Position;Ljava/lang/String;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTextScreen_1native__JLbwapi_Position_2Ljava_lang_String_2
+  (JNIEnv *, jobject, jlong, jobject, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBox_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBox_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBox_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBox_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMap_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMap_native
+ * Signature: (JIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMap_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMap_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMouse_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMouse_native
+ * Signature: (JIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMouse_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxMouse_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxScreen_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxScreen_native
+ * Signature: (JIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxScreen_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawBoxScreen_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawBoxScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangle_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangle_1native__JLbwapi_CoordinateType_Enum_2IIIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangle_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangle_1native__JLbwapi_CoordinateType_Enum_2IIIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMap_native
+ * Signature: (JIIIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JIIIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMap_native
+ * Signature: (JIIIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JIIIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMap_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMap_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMouse_native
+ * Signature: (JIIIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JIIIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMouse_native
+ * Signature: (JIIIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JIIIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMouse_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleMouse_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleScreen_native
+ * Signature: (JIIIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JIIIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleScreen_native
+ * Signature: (JIIIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JIIIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleScreen_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawTriangleScreen_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Position;Lbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawTriangleScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircle_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircle_1native__JLbwapi_CoordinateType_Enum_2IIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircle_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircle_1native__JLbwapi_CoordinateType_Enum_2IIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMap_native
+ * Signature: (JIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMap_native
+ * Signature: (JIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMap_native
+ * Signature: (JLbwapi/Position;ILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JLbwapi_Position_2ILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMap_native
+ * Signature: (JLbwapi/Position;ILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMap_1native__JLbwapi_Position_2ILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMouse_native
+ * Signature: (JIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMouse_native
+ * Signature: (JIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMouse_native
+ * Signature: (JLbwapi/Position;ILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JLbwapi_Position_2ILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleMouse_native
+ * Signature: (JLbwapi/Position;ILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleMouse_1native__JLbwapi_Position_2ILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleScreen_native
+ * Signature: (JIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleScreen_native
+ * Signature: (JIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleScreen_native
+ * Signature: (JLbwapi/Position;ILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JLbwapi_Position_2ILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawCircleScreen_native
+ * Signature: (JLbwapi/Position;ILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawCircleScreen_1native__JLbwapi_Position_2ILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipse_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipse_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipse_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipse_1native__JLbwapi_CoordinateType_Enum_2IIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMap_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMap_native
+ * Signature: (JIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMap_native
+ * Signature: (JLbwapi/Position;IILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JLbwapi_Position_2IILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMap_native
+ * Signature: (JLbwapi/Position;IILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMap_1native__JLbwapi_Position_2IILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMouse_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMouse_native
+ * Signature: (JIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMouse_native
+ * Signature: (JLbwapi/Position;IILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JLbwapi_Position_2IILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseMouse_native
+ * Signature: (JLbwapi/Position;IILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseMouse_1native__JLbwapi_Position_2IILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseScreen_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseScreen_native
+ * Signature: (JIIIILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JIIIILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseScreen_native
+ * Signature: (JLbwapi/Position;IILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JLbwapi_Position_2IILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawEllipseScreen_native
+ * Signature: (JLbwapi/Position;IILbwapi/Color;Z)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawEllipseScreen_1native__JLbwapi_Position_2IILbwapi_Color_2Z
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawDot_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDot_1native
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawDotMap_native
+ * Signature: (JIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMap_1native__JIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawDotMap_native
+ * Signature: (JLbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMap_1native__JLbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawDotMouse_native
+ * Signature: (JIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMouse_1native__JIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawDotMouse_native
+ * Signature: (JLbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotMouse_1native__JLbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawDotScreen_native
+ * Signature: (JIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotScreen_1native__JIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawDotScreen_native
+ * Signature: (JLbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawDotScreen_1native__JLbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawLine_native
+ * Signature: (JLbwapi/CoordinateType/Enum;IIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLine_1native
+  (JNIEnv *, jobject, jlong, jobject, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawLineMap_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMap_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawLineMap_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMap_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawLineMouse_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMouse_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawLineMouse_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineMouse_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawLineScreen_native
+ * Signature: (JIIIILbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineScreen_1native__JIIIILbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jint, jint, jint, jint, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    drawLineScreen_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;Lbwapi/Color;)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_drawLineScreen_1native__JLbwapi_Position_2Lbwapi_Position_2Lbwapi_Color_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getLatencyFrames_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatencyFrames_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getLatencyTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLatencyTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getRemainingLatencyFrames_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRemainingLatencyFrames_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getRemainingLatencyTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRemainingLatencyTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getRevision_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getRevision_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isDebug_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isDebug_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isLatComEnabled_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isLatComEnabled_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setLatCom_native
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setLatCom_1native
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    isGUIEnabled_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_isGUIEnabled_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setGUI_native
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setGUI_1native
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getInstanceNumber_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getInstanceNumber_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getAPM_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getAPM_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getAPM_native
+ * Signature: (JZ)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getAPM_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setMap_native
+ * Signature: (JLjava/lang/String;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setMap_1native
+  (JNIEnv *, jobject, jlong, jstring);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setFrameSkip_native
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setFrameSkip_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    hasPath_native
+ * Signature: (JLbwapi/Position;Lbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_hasPath_1native
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setAlliance_native
+ * Signature: (JLbwapi/Player;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setAlliance_native
+ * Signature: (JLbwapi/Player;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setAlliance_native
+ * Signature: (JLbwapi/Player;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setAlliance_1native__JLbwapi_Player_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setVision_native
+ * Signature: (JLbwapi/Player;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setVision_1native__JLbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setVision_native
+ * Signature: (JLbwapi/Player;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setVision_1native__JLbwapi_Player_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    elapsedTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_elapsedTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setCommandOptimizationLevel_native
+ * Signature: (JI)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Game_setCommandOptimizationLevel_1native
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    countdownTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_countdownTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getAllRegions_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getAllRegions_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getRegionAt_native
+ * Signature: (JII)Lbwapi/Region;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegionAt_1native__JII
+  (JNIEnv *, jobject, jlong, jint, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getRegionAt_native
+ * Signature: (JLbwapi/Position;)Lbwapi/Region;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getRegionAt_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getLastEventTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getLastEventTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setRevealAll_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setRevealAll_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    setRevealAll_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Game_setRevealAll_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getBuildLocation_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;I)Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2I
+  (JNIEnv *, jobject, jlong, jobject, jobject, jint);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getBuildLocation_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getBuildLocation_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;IZ)Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Game_getBuildLocation_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2IZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jint, jboolean);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getDamageFrom_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getDamageFrom_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getDamageFrom_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;Lbwapi/Player;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageFrom_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2Lbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getDamageTo_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getDamageTo_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Game
+ * Method:    getDamageTo_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/UnitType;Lbwapi/Player;Lbwapi/Player;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Game_getDamageTo_1native__JLbwapi_UnitType_2Lbwapi_UnitType_2Lbwapi_Player_2Lbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject, jobject, jobject, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_GameType.h b/headers4/bwapi_GameType.h
new file mode 100644
index 0000000..ac84502
--- /dev/null
+++ b/headers4/bwapi_GameType.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_GameType */
+
+#ifndef _Included_bwapi_GameType
+#define _Included_bwapi_GameType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_GameType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_GameType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Key.h b/headers4/bwapi_Key.h
new file mode 100644
index 0000000..ad9682d
--- /dev/null
+++ b/headers4/bwapi_Key.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Key */
+
+#ifndef _Included_bwapi_Key
+#define _Included_bwapi_Key
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Mirror.h b/headers4/bwapi_Mirror.h
new file mode 100644
index 0000000..a8fd08c
--- /dev/null
+++ b/headers4/bwapi_Mirror.h
@@ -0,0 +1,23 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Mirror */
+
+#ifndef _Included_bwapi_Mirror
+#define _Included_bwapi_Mirror
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef bwapi_Mirror_EXTRACT_JAR
+#define bwapi_Mirror_EXTRACT_JAR 1L
+/*
+ * Class:     bwapi_Mirror
+ * Method:    startGame
+ * Signature: ()V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Mirror_startGame
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Mirror_FrameCallback.h b/headers4/bwapi_Mirror_FrameCallback.h
new file mode 100644
index 0000000..f6c8659
--- /dev/null
+++ b/headers4/bwapi_Mirror_FrameCallback.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Mirror_FrameCallback */
+
+#ifndef _Included_bwapi_Mirror_FrameCallback
+#define _Included_bwapi_Mirror_FrameCallback
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Mirror_JarResources.h b/headers4/bwapi_Mirror_JarResources.h
new file mode 100644
index 0000000..1472fdf
--- /dev/null
+++ b/headers4/bwapi_Mirror_JarResources.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Mirror_JarResources */
+
+#ifndef _Included_bwapi_Mirror_JarResources
+#define _Included_bwapi_Mirror_JarResources
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_MouseButton.h b/headers4/bwapi_MouseButton.h
new file mode 100644
index 0000000..b3310cd
--- /dev/null
+++ b/headers4/bwapi_MouseButton.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_MouseButton */
+
+#ifndef _Included_bwapi_MouseButton
+#define _Included_bwapi_MouseButton
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Order.h b/headers4/bwapi_Order.h
new file mode 100644
index 0000000..bff8b01
--- /dev/null
+++ b/headers4/bwapi_Order.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Order */
+
+#ifndef _Included_bwapi_Order
+#define _Included_bwapi_Order
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Player.h b/headers4/bwapi_Player.h
new file mode 100644
index 0000000..c86303d
--- /dev/null
+++ b/headers4/bwapi_Player.h
@@ -0,0 +1,501 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Player */
+
+#ifndef _Included_bwapi_Player
+#define _Included_bwapi_Player
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Player
+ * Method:    getID_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getID_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getName_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Player_getName_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getRace_native
+ * Signature: (J)Lbwapi/Race;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getRace_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getType_native
+ * Signature: (J)Lbwapi/PlayerType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getForce_native
+ * Signature: (J)Lbwapi/Force;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getForce_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isAlly_native
+ * Signature: (JLbwapi/Player;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isAlly_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isEnemy_native
+ * Signature: (JLbwapi/Player;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isEnemy_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isNeutral_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isNeutral_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getStartLocation_native
+ * Signature: (J)Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getStartLocation_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isVictorious_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isVictorious_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isDefeated_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isDefeated_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    leftGame_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_leftGame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    minerals_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_minerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    gas_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_gas_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    gatheredMinerals_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_gatheredMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    gatheredGas_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_gatheredGas_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    repairedMinerals_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_repairedMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    repairedGas_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_repairedGas_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    refundedMinerals_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_refundedMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    refundedGas_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_refundedGas_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    spentMinerals_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_spentMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    spentGas_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_spentGas_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    supplyTotal_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyTotal_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    supplyTotal_native
+ * Signature: (JLbwapi/Race;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyTotal_1native__JLbwapi_Race_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    supplyUsed_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyUsed_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    supplyUsed_native
+ * Signature: (JLbwapi/Race;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_supplyUsed_1native__JLbwapi_Race_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    allUnitCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_allUnitCount_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    allUnitCount_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_allUnitCount_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    visibleUnitCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_visibleUnitCount_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    visibleUnitCount_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_visibleUnitCount_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    completedUnitCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_completedUnitCount_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    completedUnitCount_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_completedUnitCount_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    incompleteUnitCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_incompleteUnitCount_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    incompleteUnitCount_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_incompleteUnitCount_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    deadUnitCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_deadUnitCount_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    deadUnitCount_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_deadUnitCount_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    killedUnitCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_killedUnitCount_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    killedUnitCount_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_killedUnitCount_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getUpgradeLevel_native
+ * Signature: (JLbwapi/UpgradeType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getUpgradeLevel_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    hasResearched_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_hasResearched_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isResearching_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isResearching_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isUpgrading_native
+ * Signature: (JLbwapi/UpgradeType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isUpgrading_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getColor_native
+ * Signature: (J)Lbwapi/Color;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Player_getColor_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getTextColor_native
+ * Signature: (J)C
+ */
+JNIEXPORT jchar JNICALL Java_bwapi_Player_getTextColor_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    maxEnergy_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_maxEnergy_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    topSpeed_native
+ * Signature: (JLbwapi/UnitType;)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Player_topSpeed_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    weaponMaxRange_native
+ * Signature: (JLbwapi/WeaponType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_weaponMaxRange_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    sightRange_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_sightRange_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    weaponDamageCooldown_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_weaponDamageCooldown_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    armor_native
+ * Signature: (JLbwapi/UnitType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_armor_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    damage_native
+ * Signature: (JLbwapi/WeaponType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_damage_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getUnitScore_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getUnitScore_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getKillScore_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getKillScore_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getBuildingScore_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getBuildingScore_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getRazingScore_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getRazingScore_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getCustomScore_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getCustomScore_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isObserver_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isObserver_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    getMaxUpgradeLevel_native
+ * Signature: (JLbwapi/UpgradeType;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Player_getMaxUpgradeLevel_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isResearchAvailable_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isResearchAvailable_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Player
+ * Method:    isUnitAvailable_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Player_isUnitAvailable_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_PlayerType.h b/headers4/bwapi_PlayerType.h
new file mode 100644
index 0000000..5663563
--- /dev/null
+++ b/headers4/bwapi_PlayerType.h
@@ -0,0 +1,37 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_PlayerType */
+
+#ifndef _Included_bwapi_PlayerType
+#define _Included_bwapi_PlayerType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_PlayerType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_PlayerType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_PlayerType
+ * Method:    isLobbyType_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_PlayerType_isLobbyType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_PlayerType
+ * Method:    isGameType_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_PlayerType_isGameType_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Playerset.h b/headers4/bwapi_Playerset.h
new file mode 100644
index 0000000..5e13d5e
--- /dev/null
+++ b/headers4/bwapi_Playerset.h
@@ -0,0 +1,45 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Playerset */
+
+#ifndef _Included_bwapi_Playerset
+#define _Included_bwapi_Playerset
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Playerset
+ * Method:    getUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Playerset_getUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Playerset
+ * Method:    setAlliance_native
+ * Signature: (JZ)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Playerset
+ * Method:    setAlliance_native
+ * Signature: (J)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Playerset
+ * Method:    setAlliance_native
+ * Signature: (JZZ)V
+ */
+JNIEXPORT void JNICALL Java_bwapi_Playerset_setAlliance_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Position.h b/headers4/bwapi_Position.h
new file mode 100644
index 0000000..43dc740
--- /dev/null
+++ b/headers4/bwapi_Position.h
@@ -0,0 +1,45 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Position */
+
+#ifndef _Included_bwapi_Position
+#define _Included_bwapi_Position
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Position
+ * Method:    isValid
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Position_isValid
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     bwapi_Position
+ * Method:    makeValid
+ * Signature: ()Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Position_makeValid
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     bwapi_Position
+ * Method:    getApproxDistance
+ * Signature: (Lbwapi/Position;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Position_getApproxDistance
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     bwapi_Position
+ * Method:    getLength
+ * Signature: ()D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Position_getLength
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_PositionOrUnit.h b/headers4/bwapi_PositionOrUnit.h
new file mode 100644
index 0000000..1a62be5
--- /dev/null
+++ b/headers4/bwapi_PositionOrUnit.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_PositionOrUnit */
+
+#ifndef _Included_bwapi_PositionOrUnit
+#define _Included_bwapi_PositionOrUnit
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_PositionedObject.h b/headers4/bwapi_PositionedObject.h
new file mode 100644
index 0000000..6a5c90b
--- /dev/null
+++ b/headers4/bwapi_PositionedObject.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_PositionedObject */
+
+#ifndef _Included_bwapi_PositionedObject
+#define _Included_bwapi_PositionedObject
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Race.h b/headers4/bwapi_Race.h
new file mode 100644
index 0000000..f423bd9
--- /dev/null
+++ b/headers4/bwapi_Race.h
@@ -0,0 +1,61 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Race */
+
+#ifndef _Included_bwapi_Race
+#define _Included_bwapi_Race
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Race
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_Race_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Race
+ * Method:    getWorker_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getWorker_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Race
+ * Method:    getCenter_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getCenter_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Race
+ * Method:    getRefinery_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getRefinery_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Race
+ * Method:    getTransport_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getTransport_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Race
+ * Method:    getSupplyProvider_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Race_getSupplyProvider_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Region.h b/headers4/bwapi_Region.h
new file mode 100644
index 0000000..eb5a3cd
--- /dev/null
+++ b/headers4/bwapi_Region.h
@@ -0,0 +1,125 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Region */
+
+#ifndef _Included_bwapi_Region
+#define _Included_bwapi_Region
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Region
+ * Method:    getID_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getID_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getRegionGroupID_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getRegionGroupID_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getCenter_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getCenter_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    isHigherGround_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Region_isHigherGround_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getDefensePriority_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getDefensePriority_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    isAccessible_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Region_isAccessible_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getNeighbors_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getNeighbors_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getBoundsLeft_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsLeft_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getBoundsTop_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsTop_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getBoundsRight_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsRight_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getBoundsBottom_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getBoundsBottom_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getClosestAccessibleRegion_native
+ * Signature: (J)Lbwapi/Region;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getClosestAccessibleRegion_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getClosestInaccessibleRegion_native
+ * Signature: (J)Lbwapi/Region;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Region_getClosestInaccessibleRegion_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Region
+ * Method:    getDistance_native
+ * Signature: (JLbwapi/Region;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Region_getDistance_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Regionset.h b/headers4/bwapi_Regionset.h
new file mode 100644
index 0000000..4f6ef35
--- /dev/null
+++ b/headers4/bwapi_Regionset.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Regionset */
+
+#ifndef _Included_bwapi_Regionset
+#define _Included_bwapi_Regionset
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Regionset
+ * Method:    getCenter_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Regionset_getCenter_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_TechType.h b/headers4/bwapi_TechType.h
new file mode 100644
index 0000000..d566ed3
--- /dev/null
+++ b/headers4/bwapi_TechType.h
@@ -0,0 +1,101 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_TechType */
+
+#ifndef _Included_bwapi_TechType
+#define _Included_bwapi_TechType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_TechType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_TechType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    getRace_native
+ * Signature: (J)Lbwapi/Race;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getRace_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    mineralPrice_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_TechType_mineralPrice_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    gasPrice_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_TechType_gasPrice_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    researchTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_TechType_researchTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    energyCost_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_TechType_energyCost_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    whatResearches_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_whatResearches_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    getWeapon_native
+ * Signature: (J)Lbwapi/WeaponType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getWeapon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    targetsUnit_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_TechType_targetsUnit_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    targetsPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_TechType_targetsPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_TechType
+ * Method:    getOrder_native
+ * Signature: (J)Lbwapi/Order;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_TechType_getOrder_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_TilePosition.h b/headers4/bwapi_TilePosition.h
new file mode 100644
index 0000000..8164f6b
--- /dev/null
+++ b/headers4/bwapi_TilePosition.h
@@ -0,0 +1,37 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_TilePosition */
+
+#ifndef _Included_bwapi_TilePosition
+#define _Included_bwapi_TilePosition
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_TilePosition
+ * Method:    isValid
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_TilePosition_isValid
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     bwapi_TilePosition
+ * Method:    makeValid
+ * Signature: ()Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_TilePosition_makeValid
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     bwapi_TilePosition
+ * Method:    getLength
+ * Signature: ()D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_TilePosition_getLength
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_UnaryFilter.h b/headers4/bwapi_UnaryFilter.h
new file mode 100644
index 0000000..367e4ec
--- /dev/null
+++ b/headers4/bwapi_UnaryFilter.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_UnaryFilter */
+
+#ifndef _Included_bwapi_UnaryFilter
+#define _Included_bwapi_UnaryFilter
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Unit.h b/headers4/bwapi_Unit.h
new file mode 100644
index 0000000..5a36bcf
--- /dev/null
+++ b/headers4/bwapi_Unit.h
@@ -0,0 +1,3645 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Unit */
+
+#ifndef _Included_bwapi_Unit
+#define _Included_bwapi_Unit
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Unit
+ * Method:    getID_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getID_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    exists_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_exists_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getReplayID_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getReplayID_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getPlayer_native
+ * Signature: (J)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPlayer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getType_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getTilePosition_native
+ * Signature: (J)Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTilePosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getAngle_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getAngle_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getVelocityX_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getVelocityX_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getVelocityY_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_Unit_getVelocityY_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRegion_native
+ * Signature: (J)Lbwapi/Region;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRegion_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getLeft_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLeft_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getTop_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getTop_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRight_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRight_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getBottom_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getBottom_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getHitPoints_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getHitPoints_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getShields_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getShields_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getEnergy_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getEnergy_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getResources_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getResources_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getResourceGroup_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getResourceGroup_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getDistance_native
+ * Signature: (JLbwapi/PositionOrUnit;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDistance_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    hasPath_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_hasPath_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getLastCommandFrame_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLastCommandFrame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getLastCommand_native
+ * Signature: (J)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLastCommand_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getLastAttackingPlayer_native
+ * Signature: (J)Lbwapi/Player;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLastAttackingPlayer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getInitialType_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getInitialPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getInitialTilePosition_native
+ * Signature: (J)Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInitialTilePosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getInitialHitPoints_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInitialHitPoints_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getInitialResources_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInitialResources_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getKillCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getKillCount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getAcidSporeCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getAcidSporeCount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getInterceptorCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getInterceptorCount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getScarabCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getScarabCount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getSpiderMineCount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpiderMineCount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getGroundWeaponCooldown_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getGroundWeaponCooldown_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getAirWeaponCooldown_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getAirWeaponCooldown_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getSpellCooldown_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpellCooldown_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getDefenseMatrixPoints_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDefenseMatrixPoints_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getDefenseMatrixTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getDefenseMatrixTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getEnsnareTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getEnsnareTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getIrradiateTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getIrradiateTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getLockdownTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getLockdownTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getMaelstromTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getMaelstromTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getOrderTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getOrderTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getPlagueTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getPlagueTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRemoveTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemoveTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getStasisTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getStasisTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getStimTimer_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getStimTimer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getBuildType_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getBuildType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getTech_native
+ * Signature: (J)Lbwapi/TechType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTech_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getUpgrade_native
+ * Signature: (J)Lbwapi/UpgradeType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getUpgrade_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRemainingBuildTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingBuildTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRemainingTrainTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingTrainTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRemainingResearchTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingResearchTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRemainingUpgradeTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getRemainingUpgradeTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getBuildUnit_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getBuildUnit_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getTarget_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTarget_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getTargetPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTargetPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getOrder_native
+ * Signature: (J)Lbwapi/Order;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrder_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getSecondaryOrder_native
+ * Signature: (J)Lbwapi/Order;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getSecondaryOrder_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getOrderTarget_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrderTarget_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getOrderTargetPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getOrderTargetPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRallyPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRallyPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getRallyUnit_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getRallyUnit_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getAddon_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getAddon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getNydusExit_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getNydusExit_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getPowerUp_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getPowerUp_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getTransport_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getTransport_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getLoadedUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLoadedUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getSpaceRemaining_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_Unit_getSpaceRemaining_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getCarrier_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getCarrier_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getInterceptors_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getInterceptors_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getHatchery_native
+ * Signature: (J)Lbwapi/Unit;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getHatchery_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    getLarva_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unit_getLarva_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    hasNuke_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_hasNuke_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isAccelerating_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAccelerating_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isAttacking_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAttacking_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isAttackFrame_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isAttackFrame_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isBeingConstructed_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingConstructed_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isBeingGathered_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingGathered_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isBeingHealed_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBeingHealed_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isBlind_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBlind_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isBraking_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBraking_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isBurrowed_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isBurrowed_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isCarryingGas_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCarryingGas_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isCarryingMinerals_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCarryingMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isCloaked_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCloaked_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isCompleted_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isCompleted_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isConstructing_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isConstructing_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isDefenseMatrixed_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isDefenseMatrixed_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isDetected_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isDetected_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isEnsnared_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isEnsnared_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isFlying_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isFlying_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isFollowing_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isFollowing_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isGatheringGas_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isGatheringGas_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isGatheringMinerals_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isGatheringMinerals_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isHallucination_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isHallucination_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isHoldingPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isHoldingPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isIdle_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isIdle_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isInterruptible_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInterruptible_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isInvincible_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInvincible_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isInWeaponRange_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isInWeaponRange_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isIrradiated_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isIrradiated_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isLifted_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLifted_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isLoaded_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLoaded_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isLockedDown_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isLockedDown_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isMaelstrommed_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMaelstrommed_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isMorphing_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMorphing_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isMoving_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isMoving_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isParasited_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isParasited_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isPatrolling_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPatrolling_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isPlagued_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPlagued_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isRepairing_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isRepairing_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isResearching_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isResearching_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isSelected_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isSelected_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isSieged_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isSieged_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isStartingAttack_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStartingAttack_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isStasised_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStasised_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isStimmed_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStimmed_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isStuck_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isStuck_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isTraining_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isTraining_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isUnderAttack_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderAttack_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isUnderDarkSwarm_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderDarkSwarm_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isUnderDisruptionWeb_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderDisruptionWeb_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isUnderStorm_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUnderStorm_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isPowered_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isPowered_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isUpgrading_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isUpgrading_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isVisible_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isVisible_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isVisible_native
+ * Signature: (JLbwapi/Player;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isVisible_1native__JLbwapi_Player_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    isTargetable_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_isTargetable_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    issueCommand_native
+ * Signature: (JLbwapi/UnitCommand;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_issueCommand_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    attack_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_attack_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    attack_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_attack_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    build_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_build_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    build_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_build_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    buildAddon_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_buildAddon_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    train_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_train_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    train_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_train_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    morph_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_morph_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    research_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_research_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    upgrade_native
+ * Signature: (JLbwapi/UpgradeType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_upgrade_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    setRallyPoint_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_setRallyPoint_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    move_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_move_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    move_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_move_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    patrol_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_patrol_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    patrol_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_patrol_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    holdPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_holdPosition_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    holdPosition_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_holdPosition_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    stop_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_stop_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    stop_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_stop_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    follow_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_follow_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    follow_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_follow_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    gather_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_gather_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    gather_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_gather_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    returnCargo_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_returnCargo_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    returnCargo_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_returnCargo_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    repair_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_repair_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    repair_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_repair_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    burrow_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_burrow_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    unburrow_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unburrow_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cloak_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cloak_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    decloak_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_decloak_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    siege_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_siege_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    unsiege_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unsiege_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    lift_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_lift_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    land_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_land_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    load_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_load_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    load_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_load_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    unload_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unload_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    unloadAll_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    unloadAll_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    unloadAll_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    unloadAll_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_unloadAll_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    rightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_rightClick_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    rightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_rightClick_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    haltConstruction_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_haltConstruction_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cancelConstruction_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelConstruction_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cancelAddon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelAddon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cancelTrain_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelTrain_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cancelTrain_native
+ * Signature: (JI)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelTrain_1native__JI
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cancelMorph_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelMorph_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cancelResearch_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelResearch_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    cancelUpgrade_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_cancelUpgrade_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    useTech_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_useTech_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    useTech_native
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_useTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    placeCOP_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_placeCOP_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommand_native
+ * Signature: (JLbwapi/UnitCommand;ZZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommand_native
+ * Signature: (JLbwapi/UnitCommand;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommand_native
+ * Signature: (JLbwapi/UnitCommand;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommand_native
+ * Signature: (JLbwapi/UnitCommand;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommand_native
+ * Signature: (JLbwapi/UnitCommand;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommand_native
+ * Signature: (JLbwapi/UnitCommand;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommand_native
+ * Signature: (JLbwapi/UnitCommand;ZZZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommand_1native__JLbwapi_UnitCommand_2ZZZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandGrouped_native
+ * Signature: (JLbwapi/UnitCommand;ZZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandGrouped_native
+ * Signature: (JLbwapi/UnitCommand;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandGrouped_native
+ * Signature: (JLbwapi/UnitCommand;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandGrouped_native
+ * Signature: (JLbwapi/UnitCommand;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandGrouped_native
+ * Signature: (JLbwapi/UnitCommand;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandGrouped_native
+ * Signature: (JLbwapi/UnitCommand;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandGrouped_native
+ * Signature: (JLbwapi/UnitCommand;ZZZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandGrouped_1native__JLbwapi_UnitCommand_2ZZZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCommand_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommand_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCommandGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommandGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCommandGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCommandGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandType_native
+ * Signature: (JLbwapi/UnitCommandType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandType_1native__JLbwapi_UnitCommandType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandType_native
+ * Signature: (JLbwapi/UnitCommandType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandType_1native__JLbwapi_UnitCommandType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandTypeGrouped_native
+ * Signature: (JLbwapi/UnitCommandType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandTypeGrouped_native
+ * Signature: (JLbwapi/UnitCommandType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canIssueCommandTypeGrouped_native
+ * Signature: (JLbwapi/UnitCommandType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canIssueCommandTypeGrouped_1native__JLbwapi_UnitCommandType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canTargetUnit_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTargetUnit_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canTargetUnit_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTargetUnit_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttack_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttack_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttack_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttack_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttack_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttack_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttack_1native__JLbwapi_PositionOrUnit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackGrouped_1native__JLbwapi_PositionOrUnit_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackMove_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMove_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackMove_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMove_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackMoveGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackMoveGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackMoveGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackMoveGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnit_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnit_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnit_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnit_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnit_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnit_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnit_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canAttackUnitGrouped_native
+ * Signature: (JLbwapi/Unit;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canAttackUnitGrouped_1native__JLbwapi_Unit_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JLbwapi/UnitType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JLbwapi/UnitType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuild_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuild_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuildAddon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuildAddon_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuildAddon_native
+ * Signature: (JLbwapi/UnitType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuildAddon_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBuildAddon_native
+ * Signature: (JLbwapi/UnitType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBuildAddon_1native__JLbwapi_UnitType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canTrain_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canTrain_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canTrain_native
+ * Signature: (JLbwapi/UnitType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canTrain_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canTrain_native
+ * Signature: (JLbwapi/UnitType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canTrain_1native__JLbwapi_UnitType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMorph_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMorph_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMorph_native
+ * Signature: (JLbwapi/UnitType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMorph_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMorph_native
+ * Signature: (JLbwapi/UnitType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMorph_1native__JLbwapi_UnitType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canResearch_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canResearch_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canResearch_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canResearch_native
+ * Signature: (JLbwapi/TechType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canResearch_1native__JLbwapi_TechType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUpgrade_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUpgrade_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUpgrade_native
+ * Signature: (JLbwapi/UpgradeType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JLbwapi_UpgradeType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUpgrade_native
+ * Signature: (JLbwapi/UpgradeType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUpgrade_1native__JLbwapi_UpgradeType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPoint_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPoint_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPoint_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPoint_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPoint_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPoint_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPoint_1native__JLbwapi_PositionOrUnit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPosition_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyPosition_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyPosition_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyUnit_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyUnit_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyUnit_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyUnit_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyUnit_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSetRallyUnit_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSetRallyUnit_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMove_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMove_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMove_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMove_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMoveGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMoveGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canMoveGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canMoveGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPatrol_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrol_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPatrol_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrol_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPatrolGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPatrolGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPatrolGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPatrolGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canFollow_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canFollow_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canFollow_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canFollow_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canFollow_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canFollow_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canFollow_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canGather_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canGather_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canGather_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canGather_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canGather_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canGather_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canGather_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canReturnCargo_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canReturnCargo_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canReturnCargo_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canReturnCargo_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canHoldPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHoldPosition_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canHoldPosition_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHoldPosition_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canStop_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canStop_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canStop_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canStop_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRepair_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRepair_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRepair_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRepair_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRepair_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRepair_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRepair_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBurrow_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBurrow_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canBurrow_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canBurrow_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnburrow_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnburrow_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnburrow_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnburrow_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCloak_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCloak_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCloak_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCloak_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canDecloak_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canDecloak_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canDecloak_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canDecloak_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSiege_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSiege_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canSiege_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canSiege_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnsiege_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnsiege_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnsiege_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnsiege_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLift_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLift_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLift_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLift_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLand_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLand_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLand_native
+ * Signature: (JLbwapi/TilePosition;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLand_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLand_native
+ * Signature: (JLbwapi/TilePosition;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLand_1native__JLbwapi_TilePosition_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLoad_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLoad_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLoad_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLoad_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLoad_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canLoad_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canLoad_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadWithOrWithoutTarget_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadWithOrWithoutTarget_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadWithOrWithoutTarget_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadWithOrWithoutTarget_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAtPosition_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAtPosition_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAtPosition_native
+ * Signature: (JLbwapi/Position;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAtPosition_1native__JLbwapi_Position_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnload_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnload_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnload_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnload_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnload_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnload_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnload_native
+ * Signature: (JLbwapi/Unit;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnload_1native__JLbwapi_Unit_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAll_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAll_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAll_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAll_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAllPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAllPosition_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAllPosition_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAllPosition_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUnloadAllPosition_native
+ * Signature: (JLbwapi/Position;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUnloadAllPosition_1native__JLbwapi_Position_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClick_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClick_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClick_1native__JLbwapi_PositionOrUnit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickGrouped_native
+ * Signature: (JLbwapi/PositionOrUnit;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickGrouped_1native__JLbwapi_PositionOrUnit_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPosition_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickPosition_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPosition_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickPositionGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickPositionGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickPositionGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickPositionGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnit_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnit_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnit_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnit_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnit_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnit_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnit_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (JZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JZZ
+  (JNIEnv *, jobject, jlong, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (JLbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (JLbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canRightClickUnitGrouped_native
+ * Signature: (JLbwapi/Unit;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canRightClickUnitGrouped_1native__JLbwapi_Unit_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canHaltConstruction_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHaltConstruction_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canHaltConstruction_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canHaltConstruction_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelConstruction_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelConstruction_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelConstruction_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelConstruction_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelAddon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelAddon_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelAddon_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelAddon_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelTrain_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrain_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelTrain_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrain_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelTrainSlot_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelTrainSlot_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelTrainSlot_native
+ * Signature: (JIZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JIZ
+  (JNIEnv *, jobject, jlong, jint, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelTrainSlot_native
+ * Signature: (JI)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JI
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelTrainSlot_native
+ * Signature: (JIZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelTrainSlot_1native__JIZZ
+  (JNIEnv *, jobject, jlong, jint, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelMorph_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelMorph_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelMorph_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelMorph_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelResearch_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelResearch_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelResearch_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelResearch_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelUpgrade_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelUpgrade_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canCancelUpgrade_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canCancelUpgrade_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithOrWithoutTarget_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithOrWithoutTarget_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithOrWithoutTarget_native
+ * Signature: (JLbwapi/TechType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithOrWithoutTarget_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithOrWithoutTarget_native
+ * Signature: (JLbwapi/TechType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithOrWithoutTarget_1native__JLbwapi_TechType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTech_native
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTech_native
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTech_native
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTech_native
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTech_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTech_native
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithoutTarget_native
+ * Signature: (JLbwapi/TechType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithoutTarget_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechWithoutTarget_native
+ * Signature: (JLbwapi/TechType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechWithoutTarget_1native__JLbwapi_TechType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechUnit_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Unit;ZZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechUnit_1native__JLbwapi_TechType_2Lbwapi_Unit_2ZZZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechPosition_native
+ * Signature: (JLbwapi/TechType;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechPosition_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechPosition_native
+ * Signature: (JLbwapi/TechType;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechPosition_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechPosition_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechPosition_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canUseTechPosition_native
+ * Signature: (JLbwapi/TechType;Lbwapi/Position;ZZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canUseTechPosition_1native__JLbwapi_TechType_2Lbwapi_Position_2ZZZ
+  (JNIEnv *, jobject, jlong, jobject, jobject, jboolean, jboolean, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPlaceCOP_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPlaceCOP_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPlaceCOP_native
+ * Signature: (JLbwapi/TilePosition;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPlaceCOP_native
+ * Signature: (JLbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unit
+ * Method:    canPlaceCOP_native
+ * Signature: (JLbwapi/TilePosition;ZZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unit_canPlaceCOP_1native__JLbwapi_TilePosition_2ZZ
+  (JNIEnv *, jobject, jlong, jobject, jboolean, jboolean);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_UnitCommand.h b/headers4/bwapi_UnitCommand.h
new file mode 100644
index 0000000..700fa5e
--- /dev/null
+++ b/headers4/bwapi_UnitCommand.h
@@ -0,0 +1,437 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_UnitCommand */
+
+#ifndef _Included_bwapi_UnitCommand
+#define _Included_bwapi_UnitCommand
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    attack
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_attack__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    attack
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_attack__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    build
+ * Signature: (Lbwapi/Unit;Lbwapi/TilePosition;Lbwapi/UnitType;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_build
+  (JNIEnv *, jclass, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    buildAddon
+ * Signature: (Lbwapi/Unit;Lbwapi/UnitType;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_buildAddon
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    train
+ * Signature: (Lbwapi/Unit;Lbwapi/UnitType;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_train
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    morph
+ * Signature: (Lbwapi/Unit;Lbwapi/UnitType;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_morph
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    research
+ * Signature: (Lbwapi/Unit;Lbwapi/TechType;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_research
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    upgrade
+ * Signature: (Lbwapi/Unit;Lbwapi/UpgradeType;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_upgrade
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    setRallyPoint
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_setRallyPoint
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    move
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_move__Lbwapi_Unit_2Lbwapi_Position_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    move
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_move__Lbwapi_Unit_2Lbwapi_Position_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    patrol
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_patrol__Lbwapi_Unit_2Lbwapi_Position_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    patrol
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_patrol__Lbwapi_Unit_2Lbwapi_Position_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    holdPosition
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_holdPosition__Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    holdPosition
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_holdPosition__Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    stop
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_stop__Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    stop
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_stop__Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    follow
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_follow__Lbwapi_Unit_2Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    follow
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_follow__Lbwapi_Unit_2Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    gather
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_gather__Lbwapi_Unit_2Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    gather
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_gather__Lbwapi_Unit_2Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    returnCargo
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_returnCargo__Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    returnCargo
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_returnCargo__Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    repair
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_repair__Lbwapi_Unit_2Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    repair
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_repair__Lbwapi_Unit_2Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    burrow
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_burrow
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    unburrow
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unburrow
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cloak
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cloak
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    decloak
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_decloak
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    siege
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_siege
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    unsiege
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unsiege
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    lift
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_lift
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    land
+ * Signature: (Lbwapi/Unit;Lbwapi/TilePosition;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_land
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    load
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_load__Lbwapi_Unit_2Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    load
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_load__Lbwapi_Unit_2Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    unload
+ * Signature: (Lbwapi/Unit;Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unload
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    unloadAll
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    unloadAll
+ * Signature: (Lbwapi/Unit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Z
+  (JNIEnv *, jclass, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    unloadAll
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Lbwapi_Position_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    unloadAll
+ * Signature: (Lbwapi/Unit;Lbwapi/Position;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_unloadAll__Lbwapi_Unit_2Lbwapi_Position_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    rightClick
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_rightClick__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    rightClick
+ * Signature: (Lbwapi/Unit;Lbwapi/PositionOrUnit;Z)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_rightClick__Lbwapi_Unit_2Lbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jclass, jobject, jobject, jboolean);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    haltConstruction
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_haltConstruction
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cancelConstruction
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelConstruction
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cancelAddon
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelAddon
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cancelTrain
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelTrain__Lbwapi_Unit_2
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cancelTrain
+ * Signature: (Lbwapi/Unit;I)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelTrain__Lbwapi_Unit_2I
+  (JNIEnv *, jclass, jobject, jint);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cancelMorph
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelMorph
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cancelResearch
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelResearch
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    cancelUpgrade
+ * Signature: (Lbwapi/Unit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_cancelUpgrade
+  (JNIEnv *, jclass, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    useTech
+ * Signature: (Lbwapi/Unit;Lbwapi/TechType;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_useTech__Lbwapi_Unit_2Lbwapi_TechType_2
+  (JNIEnv *, jclass, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    useTech
+ * Signature: (Lbwapi/Unit;Lbwapi/TechType;Lbwapi/PositionOrUnit;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_useTech__Lbwapi_Unit_2Lbwapi_TechType_2Lbwapi_PositionOrUnit_2
+  (JNIEnv *, jclass, jobject, jobject, jobject);
+
+/*
+ * Class:     bwapi_UnitCommand
+ * Method:    placeCOP
+ * Signature: (Lbwapi/Unit;Lbwapi/TilePosition;)Lbwapi/UnitCommand;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitCommand_placeCOP
+  (JNIEnv *, jclass, jobject, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_UnitCommandType.h b/headers4/bwapi_UnitCommandType.h
new file mode 100644
index 0000000..ababa47
--- /dev/null
+++ b/headers4/bwapi_UnitCommandType.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_UnitCommandType */
+
+#ifndef _Included_bwapi_UnitCommandType
+#define _Included_bwapi_UnitCommandType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_UnitCommandType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_UnitCommandType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_UnitFilter.h b/headers4/bwapi_UnitFilter.h
new file mode 100644
index 0000000..2d92698
--- /dev/null
+++ b/headers4/bwapi_UnitFilter.h
@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_UnitFilter */
+
+#ifndef _Included_bwapi_UnitFilter
+#define _Included_bwapi_UnitFilter
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_UnitSizeType.h b/headers4/bwapi_UnitSizeType.h
new file mode 100644
index 0000000..e32b433
--- /dev/null
+++ b/headers4/bwapi_UnitSizeType.h
@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_UnitSizeType */
+
+#ifndef _Included_bwapi_UnitSizeType
+#define _Included_bwapi_UnitSizeType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_UnitSizeType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_UnitSizeType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_UnitType.h b/headers4/bwapi_UnitType.h
new file mode 100644
index 0000000..c5de967
--- /dev/null
+++ b/headers4/bwapi_UnitType.h
@@ -0,0 +1,597 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_UnitType */
+
+#ifndef _Included_bwapi_UnitType
+#define _Included_bwapi_UnitType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_UnitType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_UnitType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    getRace_native
+ * Signature: (J)Lbwapi/Race;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_getRace_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    requiredTech_native
+ * Signature: (J)Lbwapi/TechType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_requiredTech_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    cloakingTech_native
+ * Signature: (J)Lbwapi/TechType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_cloakingTech_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    armorUpgrade_native
+ * Signature: (J)Lbwapi/UpgradeType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_armorUpgrade_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    maxHitPoints_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxHitPoints_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    maxShields_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxShields_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    maxEnergy_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxEnergy_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    armor_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_armor_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    mineralPrice_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_mineralPrice_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    gasPrice_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_gasPrice_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    buildTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_buildTime_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    supplyRequired_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_supplyRequired_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    supplyProvided_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_supplyProvided_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    spaceRequired_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_spaceRequired_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    spaceProvided_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_spaceProvided_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    buildScore_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_buildScore_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    destroyScore_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_destroyScore_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    size_native
+ * Signature: (J)Lbwapi/UnitSizeType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_size_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    tileWidth_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_tileWidth_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    tileHeight_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_tileHeight_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    tileSize_native
+ * Signature: (J)Lbwapi/TilePosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_tileSize_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    dimensionLeft_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionLeft_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    dimensionUp_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionUp_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    dimensionRight_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionRight_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    dimensionDown_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_dimensionDown_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    width_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_width_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    height_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_height_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    seekRange_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_seekRange_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    sightRange_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_sightRange_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    groundWeapon_native
+ * Signature: (J)Lbwapi/WeaponType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_groundWeapon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    maxGroundHits_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxGroundHits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    airWeapon_native
+ * Signature: (J)Lbwapi/WeaponType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UnitType_airWeapon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    maxAirHits_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_maxAirHits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    topSpeed_native
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_UnitType_topSpeed_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    acceleration_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_acceleration_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    haltDistance_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_haltDistance_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    turnRadius_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UnitType_turnRadius_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    canProduce_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canProduce_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    canAttack_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canAttack_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    canMove_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canMove_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isFlyer_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlyer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    regeneratesHP_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_regeneratesHP_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isSpellcaster_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpellcaster_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    hasPermanentCloak_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_hasPermanentCloak_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isInvincible_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isInvincible_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isOrganic_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isOrganic_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isMechanical_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isMechanical_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isRobotic_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isRobotic_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isDetector_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isDetector_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isResourceContainer_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isResourceContainer_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isResourceDepot_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isResourceDepot_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isRefinery_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isRefinery_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isWorker_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isWorker_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    requiresPsi_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_requiresPsi_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    requiresCreep_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_requiresCreep_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isTwoUnitsInOneEgg_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isTwoUnitsInOneEgg_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isBurrowable_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBurrowable_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isCloakable_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isCloakable_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isBuilding_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBuilding_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isAddon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isAddon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isFlyingBuilding_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlyingBuilding_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isNeutral_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isNeutral_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isHero_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isHero_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isPowerup_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isPowerup_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isBeacon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isBeacon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isFlagBeacon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isFlagBeacon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isSpecialBuilding_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpecialBuilding_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isSpell_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isSpell_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    producesLarva_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_producesLarva_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isMineralField_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isMineralField_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    isCritter_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_isCritter_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UnitType
+ * Method:    canBuildAddon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_UnitType_canBuildAddon_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Unitset.h b/headers4/bwapi_Unitset.h
new file mode 100644
index 0000000..8ef54a5
--- /dev/null
+++ b/headers4/bwapi_Unitset.h
@@ -0,0 +1,445 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Unitset */
+
+#ifndef _Included_bwapi_Unitset
+#define _Included_bwapi_Unitset
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_Unitset
+ * Method:    getPosition_native
+ * Signature: (J)Lbwapi/Position;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getPosition_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    getLoadedUnits_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getLoadedUnits_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    getInterceptors_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getInterceptors_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    getLarva_native
+ * Signature: (J)Ljava/util/List;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_Unitset_getLarva_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    issueCommand_native
+ * Signature: (JLbwapi/UnitCommand;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_issueCommand_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    attack_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_attack_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    attack_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_attack_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    build_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_build_1native__JLbwapi_UnitType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    build_native
+ * Signature: (JLbwapi/UnitType;Lbwapi/TilePosition;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_build_1native__JLbwapi_UnitType_2Lbwapi_TilePosition_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    buildAddon_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_buildAddon_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    train_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_train_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    morph_native
+ * Signature: (JLbwapi/UnitType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_morph_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    setRallyPoint_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_setRallyPoint_1native
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    move_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_move_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    move_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_move_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    patrol_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_patrol_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    patrol_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_patrol_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    holdPosition_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_holdPosition_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    holdPosition_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_holdPosition_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    stop_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_stop_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    stop_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_stop_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    follow_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_follow_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    follow_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_follow_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    gather_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_gather_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    gather_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_gather_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    returnCargo_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_returnCargo_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    returnCargo_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_returnCargo_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    repair_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_repair_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    repair_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_repair_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    burrow_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_burrow_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    unburrow_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unburrow_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cloak_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cloak_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    decloak_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_decloak_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    siege_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_siege_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    unsiege_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unsiege_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    lift_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_lift_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    load_native
+ * Signature: (JLbwapi/Unit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_load_1native__JLbwapi_Unit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    load_native
+ * Signature: (JLbwapi/Unit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_load_1native__JLbwapi_Unit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    unloadAll_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    unloadAll_native
+ * Signature: (JZ)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JZ
+  (JNIEnv *, jobject, jlong, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    unloadAll_native
+ * Signature: (JLbwapi/Position;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JLbwapi_Position_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    unloadAll_native
+ * Signature: (JLbwapi/Position;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_unloadAll_1native__JLbwapi_Position_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    rightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_rightClick_1native__JLbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    rightClick_native
+ * Signature: (JLbwapi/PositionOrUnit;Z)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_rightClick_1native__JLbwapi_PositionOrUnit_2Z
+  (JNIEnv *, jobject, jlong, jobject, jboolean);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    haltConstruction_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_haltConstruction_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cancelConstruction_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelConstruction_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cancelAddon_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelAddon_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cancelTrain_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelTrain_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cancelTrain_native
+ * Signature: (JI)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelTrain_1native__JI
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cancelMorph_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelMorph_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cancelResearch_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelResearch_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    cancelUpgrade_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_cancelUpgrade_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    useTech_native
+ * Signature: (JLbwapi/TechType;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_useTech_1native__JLbwapi_TechType_2
+  (JNIEnv *, jobject, jlong, jobject);
+
+/*
+ * Class:     bwapi_Unitset
+ * Method:    useTech_native
+ * Signature: (JLbwapi/TechType;Lbwapi/PositionOrUnit;)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_Unitset_useTech_1native__JLbwapi_TechType_2Lbwapi_PositionOrUnit_2
+  (JNIEnv *, jobject, jlong, jobject, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_UpgradeType.h b/headers4/bwapi_UpgradeType.h
new file mode 100644
index 0000000..9019f22
--- /dev/null
+++ b/headers4/bwapi_UpgradeType.h
@@ -0,0 +1,133 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_UpgradeType */
+
+#ifndef _Included_bwapi_UpgradeType
+#define _Included_bwapi_UpgradeType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_UpgradeType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    getRace_native
+ * Signature: (J)Lbwapi/Race;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_getRace_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    mineralPrice_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPrice_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    mineralPrice_native
+ * Signature: (JI)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPrice_1native__JI
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    mineralPriceFactor_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_mineralPriceFactor_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    gasPrice_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPrice_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    gasPrice_native
+ * Signature: (JI)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPrice_1native__JI
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    gasPriceFactor_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_gasPriceFactor_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    upgradeTime_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTime_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    upgradeTime_native
+ * Signature: (JI)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTime_1native__JI
+  (JNIEnv *, jobject, jlong, jint);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    upgradeTimeFactor_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_upgradeTimeFactor_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    maxRepeats_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_UpgradeType_maxRepeats_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    whatUpgrades_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatUpgrades_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    whatsRequired_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatsRequired_1native__J
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_UpgradeType
+ * Method:    whatsRequired_native
+ * Signature: (JI)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_UpgradeType_whatsRequired_1native__JI
+  (JNIEnv *, jobject, jlong, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_Utils.h b/headers4/bwapi_Utils.h
new file mode 100644
index 0000000..144ad40
--- /dev/null
+++ b/headers4/bwapi_Utils.h
@@ -0,0 +1,75 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_Utils */
+
+#ifndef _Included_bwapi_Utils
+#define _Included_bwapi_Utils
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef bwapi_Utils_Previous
+#define bwapi_Utils_Previous 1L
+#undef bwapi_Utils_Cyan
+#define bwapi_Utils_Cyan 2L
+#undef bwapi_Utils_Yellow
+#define bwapi_Utils_Yellow 3L
+#undef bwapi_Utils_White
+#define bwapi_Utils_White 4L
+#undef bwapi_Utils_Grey
+#define bwapi_Utils_Grey 5L
+#undef bwapi_Utils_Red
+#define bwapi_Utils_Red 6L
+#undef bwapi_Utils_Green
+#define bwapi_Utils_Green 7L
+#undef bwapi_Utils_Red_P1
+#define bwapi_Utils_Red_P1 8L
+#undef bwapi_Utils_Tab
+#define bwapi_Utils_Tab 9L
+#undef bwapi_Utils_Newline
+#define bwapi_Utils_Newline 10L
+#undef bwapi_Utils_Invisible_no_override
+#define bwapi_Utils_Invisible_no_override 11L
+#undef bwapi_Utils_Remove_beyond
+#define bwapi_Utils_Remove_beyond 12L
+#undef bwapi_Utils_Clear_formatting
+#define bwapi_Utils_Clear_formatting 13L
+#undef bwapi_Utils_Blue
+#define bwapi_Utils_Blue 14L
+#undef bwapi_Utils_Teal
+#define bwapi_Utils_Teal 15L
+#undef bwapi_Utils_Purple
+#define bwapi_Utils_Purple 16L
+#undef bwapi_Utils_Orange
+#define bwapi_Utils_Orange 17L
+#undef bwapi_Utils_Right_Align
+#define bwapi_Utils_Right_Align 18L
+#undef bwapi_Utils_Center_Align
+#define bwapi_Utils_Center_Align 19L
+#undef bwapi_Utils_Invisible
+#define bwapi_Utils_Invisible 20L
+#undef bwapi_Utils_Brown
+#define bwapi_Utils_Brown 21L
+#undef bwapi_Utils_White_p7
+#define bwapi_Utils_White_p7 22L
+#undef bwapi_Utils_Yellow_p8
+#define bwapi_Utils_Yellow_p8 23L
+#undef bwapi_Utils_Green_p9
+#define bwapi_Utils_Green_p9 24L
+#undef bwapi_Utils_Brighter_Yellow
+#define bwapi_Utils_Brighter_Yellow 25L
+#undef bwapi_Utils_Cyan_default
+#define bwapi_Utils_Cyan_default 26L
+#undef bwapi_Utils_Pinkish
+#define bwapi_Utils_Pinkish 27L
+#undef bwapi_Utils_Dark_Cyan
+#define bwapi_Utils_Dark_Cyan 28L
+#undef bwapi_Utils_Greygreen
+#define bwapi_Utils_Greygreen 29L
+#undef bwapi_Utils_Bluegrey
+#define bwapi_Utils_Bluegrey 30L
+#undef bwapi_Utils_Turquoise
+#define bwapi_Utils_Turquoise 31L
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_WalkPosition.h b/headers4/bwapi_WalkPosition.h
new file mode 100644
index 0000000..826afd4
--- /dev/null
+++ b/headers4/bwapi_WalkPosition.h
@@ -0,0 +1,45 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_WalkPosition */
+
+#ifndef _Included_bwapi_WalkPosition
+#define _Included_bwapi_WalkPosition
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_WalkPosition
+ * Method:    isValid
+ * Signature: ()Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WalkPosition_isValid
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     bwapi_WalkPosition
+ * Method:    makeValid
+ * Signature: ()Lbwapi/WalkPosition;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_WalkPosition_makeValid
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     bwapi_WalkPosition
+ * Method:    getApproxDistance
+ * Signature: (Lbwapi/WalkPosition;)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WalkPosition_getApproxDistance
+  (JNIEnv *, jobject, jobject);
+
+/*
+ * Class:     bwapi_WalkPosition
+ * Method:    getLength
+ * Signature: ()D
+ */
+JNIEXPORT jdouble JNICALL Java_bwapi_WalkPosition_getLength
+  (JNIEnv *, jobject);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/headers4/bwapi_WeaponType.h b/headers4/bwapi_WeaponType.h
new file mode 100644
index 0000000..d521724
--- /dev/null
+++ b/headers4/bwapi_WeaponType.h
@@ -0,0 +1,205 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class bwapi_WeaponType */
+
+#ifndef _Included_bwapi_WeaponType
+#define _Included_bwapi_WeaponType
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    toString_native
+ * Signature: (J)Ljava/lang/String;
+ */
+JNIEXPORT jstring JNICALL Java_bwapi_WeaponType_toString_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    getTech_native
+ * Signature: (J)Lbwapi/TechType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_getTech_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    whatUses_native
+ * Signature: (J)Lbwapi/UnitType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_whatUses_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    damageAmount_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageAmount_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    damageBonus_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageBonus_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    damageCooldown_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageCooldown_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    damageFactor_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_damageFactor_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    upgradeType_native
+ * Signature: (J)Lbwapi/UpgradeType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_upgradeType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    damageType_native
+ * Signature: (J)Lbwapi/DamageType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_damageType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    explosionType_native
+ * Signature: (J)Lbwapi/ExplosionType;
+ */
+JNIEXPORT jobject JNICALL Java_bwapi_WeaponType_explosionType_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    minRange_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_minRange_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    maxRange_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_maxRange_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    innerSplashRadius_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_innerSplashRadius_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    medianSplashRadius_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_medianSplashRadius_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    outerSplashRadius_native
+ * Signature: (J)I
+ */
+JNIEXPORT jint JNICALL Java_bwapi_WeaponType_outerSplashRadius_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsAir_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsAir_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsGround_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsGround_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsMechanical_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsMechanical_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsOrganic_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOrganic_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsNonBuilding_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsNonBuilding_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsNonRobotic_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsNonRobotic_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsTerrain_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsTerrain_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsOrgOrMech_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOrgOrMech_1native
+  (JNIEnv *, jobject, jlong);
+
+/*
+ * Class:     bwapi_WeaponType
+ * Method:    targetsOwn_native
+ * Signature: (J)Z
+ */
+JNIEXPORT jboolean JNICALL Java_bwapi_WeaponType_targetsOwn_1native
+  (JNIEnv *, jobject, jlong);
+
+#ifdef __cplusplus
+}
+#endif
+#endif
diff --git a/manual-bwapi4/AIModule.java b/manual-bwapi4/AIModule.java
index ad9e0b6..98891a6 100644
--- a/manual-bwapi4/AIModule.java
+++ b/manual-bwapi4/AIModule.java
@@ -1,6 +1,6 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.BWEventListener;
+import bwapi.BWEventListener;
 
 /**
  * This class receives all events from Broodwar.
diff --git a/manual-bwapi4/AbstractPoint.java b/manual-bwapi4/AbstractPoint.java
index 29af5b8..067ca6c 100644
--- a/manual-bwapi4/AbstractPoint.java
+++ b/manual-bwapi4/AbstractPoint.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 /**
  * Common ancestor for location based objects to simplify distance computation.
@@ -18,11 +18,11 @@ public abstract class AbstractPoint<T extends AbstractPoint> {
         return getPoint().getY();
     }
 
-    public double distanceTo(AbstractPoint<T> otherPosition) {
-        return distanceTo(otherPosition.getX(), otherPosition.getY());
+    public double getDistance(AbstractPoint<T> otherPosition) {
+        return getDistance(otherPosition.getX(), otherPosition.getY());
     }
 
-    public double distanceTo(int x, int y) {
+    public double getDistance(int x, int y) {
         double dx = x - getX();
         double dy = y - getY();
         return Math.sqrt(dx * dx + dy * dy);
diff --git a/manual-bwapi4/BWEventListener.java b/manual-bwapi4/BWEventListener.java
index 6f9f031..84cbb09 100644
--- a/manual-bwapi4/BWEventListener.java
+++ b/manual-bwapi4/BWEventListener.java
@@ -1,6 +1,6 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.*;
+import bwapi.*;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/manual-bwapi4/BestUnitFilter.java b/manual-bwapi4/BestUnitFilter.java
index 4a90ead..7b57f8c 100644
--- a/manual-bwapi4/BestUnitFilter.java
+++ b/manual-bwapi4/BestUnitFilter.java
@@ -1,6 +1,6 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.*;
+import bwapi.*;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/manual-bwapi4/CenteredObject.java b/manual-bwapi4/CenteredObject.java
index 2a200ac..dd751b0 100644
--- a/manual-bwapi4/CenteredObject.java
+++ b/manual-bwapi4/CenteredObject.java
@@ -1,6 +1,6 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.Position;
+import bwapi.Position;
 
 /**
  * Interrmediate class used to translate getPoint() calls to getCenter() calls.
diff --git a/manual-bwapi4/Color.java b/manual-bwapi4/Color.java
index e15c22a..ab029c8 100644
--- a/manual-bwapi4/Color.java
+++ b/manual-bwapi4/Color.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 import java.lang.Override;
 import java.util.HashMap;
diff --git a/manual-bwapi4/DefaultBWListener.java b/manual-bwapi4/DefaultBWListener.java
index 76df50e..eb3de83 100644
--- a/manual-bwapi4/DefaultBWListener.java
+++ b/manual-bwapi4/DefaultBWListener.java
@@ -1,9 +1,9 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.BWEventListener;
-import bwapi4.Player;
-import bwapi4.Position;
-import bwapi4.Unit;
+import bwapi.BWEventListener;
+import bwapi.Player;
+import bwapi.Position;
+import bwapi.Unit;
 
 /**
  * A utility stub class providing a default implementation of {@link BWEventListener},
diff --git a/manual-bwapi4/Mirror.java b/manual-bwapi4/Mirror.java
index 59235f0..0132272 100644
--- a/manual-bwapi4/Mirror.java
+++ b/manual-bwapi4/Mirror.java
@@ -1,7 +1,7 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.AIModule;
-import bwapi4.BWEventListener;
+import bwapi.AIModule;
+import bwapi.BWEventListener;
 
 import java.io.*;
 import java.io.File;
@@ -60,7 +60,7 @@ public class Mirror {
 
     static {
         String arch = System.getProperty("os.arch");
-        String dllNames[] = {"BWAPI4", "gmp-vc90-mt", "mpfr-vc90-mt"};
+        String dllNames[] = {"bwapi_bridge" + VERSION};
         if(!arch.equals("x86")){
             throw new UnsupportedOperationException("BWMirror API supports only x86 architecture.");
         }
diff --git a/manual-bwapi4/Position.java b/manual-bwapi4/Position.java
index b4efd8e..3955987 100644
--- a/manual-bwapi4/Position.java
+++ b/manual-bwapi4/Position.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 import java.lang.Override;
 import java.util.HashMap;
@@ -24,8 +24,6 @@ public class Position extends AbstractPoint<Position>{
 
     public native Position makeValid();
 
-    public native double getDistance(Position position);
-
     public native int getApproxDistance(Position position);
 
     public native double getLength();
diff --git a/manual-bwapi4/PositionOrUnit.java b/manual-bwapi4/PositionOrUnit.java
index b371c13..c0da66a 100644
--- a/manual-bwapi4/PositionOrUnit.java
+++ b/manual-bwapi4/PositionOrUnit.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 import java.lang.IllegalArgumentException;
 import java.lang.Object;
diff --git a/manual-bwapi4/PositionedObject.java b/manual-bwapi4/PositionedObject.java
index d739a6a..4d40575 100644
--- a/manual-bwapi4/PositionedObject.java
+++ b/manual-bwapi4/PositionedObject.java
@@ -1,6 +1,6 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.Position;
+import bwapi.Position;
 
 /**
  * Interrmediate class used to translate getPoint() calls to getPosition() calls.
diff --git a/manual-bwapi4/TilePosition.java b/manual-bwapi4/TilePosition.java
index 711ee06..a88ae76 100644
--- a/manual-bwapi4/TilePosition.java
+++ b/manual-bwapi4/TilePosition.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 import java.lang.Override;
 import java.util.HashMap;
@@ -9,7 +9,7 @@ import java.util.Map;
  * These are called build tiles because buildability data is available at this resolution, and correspond to the tiles seen in game.
  * For example, a Command Center occupies an area of 4x3 build tiles.
  */
-public class TilePosition  extends AbstractPoint<TilePosition>{
+public class TilePosition extends AbstractPoint<TilePosition>{
     private int x, y;
 
     public TilePosition(int x, int y) {
@@ -25,8 +25,6 @@ public class TilePosition  extends AbstractPoint<TilePosition>{
 
     public native TilePosition makeValid();
 
-    public native double getDistance(TilePosition position);
-
     public native double getLength();
 
     public int getX() {
diff --git a/manual-bwapi4/UnitCommand.java b/manual-bwapi4/UnitCommand.java
index 00b3d2f..5c2f96a 100644
--- a/manual-bwapi4/UnitCommand.java
+++ b/manual-bwapi4/UnitCommand.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 
 public class UnitCommand {
diff --git a/manual-bwapi4/UnitFilter.java b/manual-bwapi4/UnitFilter.java
index 99f65d6..02f0911 100644
--- a/manual-bwapi4/UnitFilter.java
+++ b/manual-bwapi4/UnitFilter.java
@@ -1,6 +1,6 @@
-package bwapi4;
+package bwapi;
 
-import bwapi4.*;
+import bwapi.*;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/manual-bwapi4/Utils.java b/manual-bwapi4/Utils.java
index 1a6154c..a597123 100644
--- a/manual-bwapi4/Utils.java
+++ b/manual-bwapi4/Utils.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 import java.lang.String;
 import java.lang.System;
diff --git a/manual-bwapi4/WalkPosition.java b/manual-bwapi4/WalkPosition.java
index 22a35f6..acd2f15 100644
--- a/manual-bwapi4/WalkPosition.java
+++ b/manual-bwapi4/WalkPosition.java
@@ -1,4 +1,4 @@
-package bwapi4;
+package bwapi;
 
 import java.lang.Override;
 import java.util.HashMap;
@@ -21,8 +21,6 @@ public class WalkPosition extends AbstractPoint<WalkPosition>{
 
     public native WalkPosition makeValid();
 
-    public native double getDistance(WalkPosition position);
-
     public native int getApproxDistance(WalkPosition position);
 
     public native double getLength();
diff --git a/out/production/InvokeGenerator/generator/CJavaPipeline.class b/out/production/InvokeGenerator/generator/CJavaPipeline.class
index d9ceade..25236ff 100644
Binary files a/out/production/InvokeGenerator/generator/CJavaPipeline.class and b/out/production/InvokeGenerator/generator/CJavaPipeline.class differ
diff --git a/out/production/InvokeGenerator/generator/JavaContext.class b/out/production/InvokeGenerator/generator/JavaContext.class
index bfc5b21..a910ac9 100644
Binary files a/out/production/InvokeGenerator/generator/JavaContext.class and b/out/production/InvokeGenerator/generator/JavaContext.class differ
diff --git a/out/production/InvokeGenerator/generator/MirrorContext.class b/out/production/InvokeGenerator/generator/MirrorContext.class
index cc13e29..7de6246 100644
Binary files a/out/production/InvokeGenerator/generator/MirrorContext.class and b/out/production/InvokeGenerator/generator/MirrorContext.class differ
diff --git a/out/production/InvokeGenerator/generator/c/HeaderMaker.class b/out/production/InvokeGenerator/generator/c/HeaderMaker.class
index c8c5d3c..9c42d44 100644
Binary files a/out/production/InvokeGenerator/generator/c/HeaderMaker.class and b/out/production/InvokeGenerator/generator/c/HeaderMaker.class differ
diff --git a/out/production/InvokeGenerator/test/api/TestBot1$1.class b/out/production/InvokeGenerator/test/api/TestBot1$1.class
index 5c6a354..a1832cf 100644
Binary files a/out/production/InvokeGenerator/test/api/TestBot1$1.class and b/out/production/InvokeGenerator/test/api/TestBot1$1.class differ
diff --git a/out/production/InvokeGenerator/test/api/TestBot1.class b/out/production/InvokeGenerator/test/api/TestBot1.class
index 45beb50..2bf247c 100644
Binary files a/out/production/InvokeGenerator/test/api/TestBot1.class and b/out/production/InvokeGenerator/test/api/TestBot1.class differ
diff --git a/src/generator/CJavaPipeline.java b/src/generator/CJavaPipeline.java
index e7276ce..0cd4444 100644
--- a/src/generator/CJavaPipeline.java
+++ b/src/generator/CJavaPipeline.java
@@ -105,7 +105,7 @@ public class CJavaPipeline {
             }
             //run the generator to create .java source files
             context.setPackage(pkg.packageName);
-            generator.run(new File("."));
+            generator.run(new File(processingOptions.getProperty(GENERATE_TO_DIR)));
 
             //store declarations for later (for binding constants)
             allDecs.addAll(cClasses);
@@ -118,7 +118,7 @@ public class CJavaPipeline {
             if (pkg.manualCopyClassesDir != null) {
                 try {
                     for (File file : pkg.manualCopyClassesDir.listFiles()) {
-                        Files.copy(file.getAbsoluteFile().toPath(), new File(pkg.packageName + "/" + file.getName()).getAbsoluteFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
+                        Files.copy(file.getAbsoluteFile().toPath(), new File(processingOptions.get(GENERATE_TO_DIR) + "/" + pkg.packageName + "/" + file.getName()).getAbsoluteFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
                     }
                 } catch (IOException e) {
                     e.printStackTrace();
@@ -134,7 +134,7 @@ public class CJavaPipeline {
         MyJavaCompiler compiler = new MyJavaCompiler();
 
         for (PackageProcessOptions pkg : packages) {
-            compiler.run(new File(pkg.packageName), javaOut);
+            compiler.run(new File(processingOptions.get(GENERATE_TO_DIR) + "/"  + pkg.packageName), javaOut);
         }
 
         /**
@@ -189,7 +189,7 @@ public class CJavaPipeline {
 
             callImplementer.notifyPackageStart();
 
-            for (File file : new File(pkg.packageName).listFiles(new FilenameFilter() {
+            for (File file : new File(processingOptions.getProperty(GENERATE_TO_DIR) +"/" + pkg.packageName).listFiles(new FilenameFilter() {
                 @Override
                 public boolean accept(File dir, String name) {
                     //we skip mirror.java as it has a native function which we implement manually
@@ -241,6 +241,7 @@ public class CJavaPipeline {
             props.put(HEADERS_DIR_PROPERTY, "headers");
             props.put(HEADER_FILE_PROPERTY, "concat_header.h");
             props.put(C_IMPLEMENTATION_FILE_PROPERTY, "c/impl.cpp");
+            props.put(GENERATE_TO_DIR, ".");
 
             new CJavaPipeline().run(new PackageProcessOptions[]{bwapiOptions, bwtaOptions}, props);
         }
@@ -250,15 +251,17 @@ public class CJavaPipeline {
             ignoredClasses.add("Position");
 
             PackageProcessOptions bwapiOptions = new PackageProcessOptions();
-            bwapiOptions.packageName = "bwapi4";
+            bwapiOptions.packageName = "bwapi";
             bwapiOptions.cHeadersDir = new File("bwapi4-includes");
             bwapiOptions.manualCopyClassesDir = new File("manual-bwapi4");
 
+
             Properties props = new Properties();
             props.put(COMPILE_DIR_PROPERTY, "compiled4");
             props.put(HEADERS_DIR_PROPERTY, "headers4");
             props.put(HEADER_FILE_PROPERTY, "concat_header4.h");
             props.put(C_IMPLEMENTATION_FILE_PROPERTY, "c4/impl.cpp");
+            props.put(GENERATE_TO_DIR, "generated");
 
             new CJavaPipeline().run(new PackageProcessOptions[]{bwapiOptions}, props);
         }
@@ -269,6 +272,7 @@ public class CJavaPipeline {
     private static final String HEADERS_DIR_PROPERTY = "headers_dir";
     private static final String C_IMPLEMENTATION_FILE_PROPERTY = "impl_file";
     private static final String HEADER_FILE_PROPERTY = "header_file";
+    private static final String GENERATE_TO_DIR = "generate_to_dir";
 
     public static boolean isBWAPI3(){
         return BWAPI_VERSION == BWAPI_V3;
diff --git a/src/generator/JavaContext.java b/src/generator/JavaContext.java
index 066a5e3..e93f995 100644
--- a/src/generator/JavaContext.java
+++ b/src/generator/JavaContext.java
@@ -18,7 +18,7 @@ public class JavaContext {
 
     private List<String> constantTypes = Arrays.asList("UnitType", "TechType", "UpgradeType", "Race", "UnitCommand", "WeaponType", "Order", "GameType", "Error", "PlayerType", "UnitCommandType");
 
-    private List<String> enumTypes = Arrays.asList("MouseButton", "Key", "bwapi4.Text.Size.Enum", "bwapi4.CoordinateType.Enum", "Text::Size::Enum", "CoordinateType::Enum");
+    private List<String> enumTypes = Arrays.asList("MouseButton", "Key", "bwapi.Text.Size.Enum", "bwapi.CoordinateType.Enum", "Text::Size::Enum", "CoordinateType::Enum");
 
     private List<String> valueReturnTypes = Arrays.asList("Event");
 
@@ -28,7 +28,6 @@ public class JavaContext {
     private String packageName = "bwapi";
 
 
-
     public JavaContext() {
         javaToCType.put("long", "jlong");
         javaToCType.put("int", "jint");
@@ -187,12 +186,12 @@ public class JavaContext {
                         ", " + fieldName + ".blue()";
             case "UnitCommand":
                 return
-                        ", env->CallStaticObjectMethod(FindCachedClass(env, \"" + packageName + "/Unit\"), FindCachedMethodStatic(env, FindCachedClass(env, \"" + packageName + "/Unit\"), \"get\", \"(J)Lbwapi4/Unit;\"), " +fieldName+ ".getUnit())\n" +
-                                ", env->CallStaticObjectMethod(FindCachedClass(env, \"" + packageName + "/UnitCommandType\"), FindCachedMethodStatic(env, FindCachedClass(env, \"" + packageName + "/UnitCommandType\"), \"get\", \"(J)Lbwapi4/UnitCommandType;\"), (jlong)tableUnitCommandType.find("+fieldName+".getType().getID())->second )\n" +
-                                ", env->CallStaticObjectMethod(FindCachedClass(env, \"" + packageName + "/Unit\"), FindCachedMethodStatic(env, FindCachedClass(env, \"" + packageName + "/Unit\"), \"get\", \"(J)Lbwapi4/Unit;\"), "+fieldName+".getTarget())\n" +
-                                ", "+ fieldName +".getTargetPosition().x \n" +
-                                ", "+ fieldName +".getTargetPosition().y \n" +
-                                ", resolveUnitCommandExtra("+fieldName+")";
+                        ", env->CallStaticObjectMethod(FindCachedClass(env, \"" + packageName + "/Unit\"), FindCachedMethodStatic(env, FindCachedClass(env, \"" + packageName + "/Unit\"), \"get\", \"(J)L" + packageName + "/Unit;\"), " + fieldName + ".getUnit())\n" +
+                                ", env->CallStaticObjectMethod(FindCachedClass(env, \"" + packageName + "/UnitCommandType\"), FindCachedMethodStatic(env, FindCachedClass(env, \"" + packageName + "/UnitCommandType\"), \"get\", \"(J)L" + packageName + "/UnitCommandType;\"), (jlong)tableUnitCommandType.find(" + fieldName + ".getType().getID())->second )\n" +
+                                ", env->CallStaticObjectMethod(FindCachedClass(env, \"" + packageName + "/Unit\"), FindCachedMethodStatic(env, FindCachedClass(env, \"" + packageName + "/Unit\"), \"get\", \"(J)L" + packageName + "/Unit;\"), " + fieldName + ".getTarget())\n" +
+                                ", " + fieldName + ".getTargetPosition().x \n" +
+                                ", " + fieldName + ".getTargetPosition().y \n" +
+                                ", resolveUnitCommandExtra(" + fieldName + ")";
             default:
                 throw new UnsupportedOperationException();
         }
diff --git a/src/generator/MirrorContext.java b/src/generator/MirrorContext.java
index f235924..ebe3a47 100644
--- a/src/generator/MirrorContext.java
+++ b/src/generator/MirrorContext.java
@@ -83,9 +83,9 @@ public class MirrorContext {
         if (cType.endsWith("*")) {
             return cType.substring(0, cType.length() - 1);
         }
-        if (CJavaPipeline.BWAPI_VERSION == CJavaPipeline.BWAPI_V4 && cType.contains("bwapi.")) {
+        /*if (CJavaPipeline.BWAPI_VERSION == CJavaPipeline.BWAPI_V4 && cType.contains("bwapi.")) {
             cType = cType.replace("bwapi.", "bwapi4.");
-        }
+        } */
         return result != null ? result : cType;
     }
 
diff --git a/src/generator/c/HeaderMaker.java b/src/generator/c/HeaderMaker.java
index f7041a9..6ff275e 100644
--- a/src/generator/c/HeaderMaker.java
+++ b/src/generator/c/HeaderMaker.java
@@ -18,7 +18,7 @@ public class HeaderMaker {
         } catch (Exception e) {
             e.printStackTrace();
         }              */
-        StringBuffer result = new StringBuffer();
+        StringBuilder result = new StringBuilder();
         for (String javaRootDir : javaRoot) {
             for (File f : new File(clpath, javaRootDir).listFiles(new FilenameFilter() {
                 @Override
diff --git a/src/test/api/TestBot1.java b/src/test/api/TestBot1.java
index 5840754..758899f 100644
--- a/src/test/api/TestBot1.java
+++ b/src/test/api/TestBot1.java
@@ -1,7 +1,7 @@
 package test.api;
 
-import bwapi4.*;
-import bwapi4.Text.Size.Enum;
+import bwapi.*;
+import bwapi.Text.Size.Enum;
 
 /**
  * User: PC
@@ -26,7 +26,7 @@ public class TestBot1 {
                 //BWTA.analyze();
                 System.out.println();
 
-                mirror.getGame().enableFlag(bwapi4.Flag.Enum.UserInput.getValue());
+                mirror.getGame().enableFlag(bwapi.Flag.Enum.UserInput.getValue());
             }
 
             @Override
@@ -61,7 +61,7 @@ public class TestBot1 {
 
                         for (Unit neutralUnit : game.neutral().getUnits()) {
                             if (neutralUnit.getType().isMineralField()) {
-                                if (closestMineral == null || myUnit.distanceTo(neutralUnit) < myUnit.distanceTo(closestMineral)) {
+                                if (closestMineral == null || myUnit.getDistance(neutralUnit) < myUnit.getDistance(closestMineral)) {
                                     closestMineral = neutralUnit;
                                 }
                             }