InputCommon/ControllerEmu: Break out functionality of EmulatedController

to eliminate redundant unused members in Wii Remote extension objects.

Source/Android/jni/AndroidCommon/IDCache.cpp

@@ -97,6 +97,10 @@ static jclass s_control_reference_class;
 static jfieldID s_control_reference_pointer;
 static jmethodID s_control_reference_constructor;
 
+static jclass s_control_group_container_class;
+static jfieldID s_control_group_container_pointer;
+static jmethodID s_control_group_container_constructor;
+
 static jclass s_emulated_controller_class;
 static jfieldID s_emulated_controller_pointer;
 static jmethodID s_emulated_controller_constructor;
@@ -446,6 +450,21 @@ jmethodID GetControlReferenceConstructor()
   return s_control_reference_constructor;
 }
 
+jclass GetControlGroupContainerClass()
+{
+  return s_control_group_container_class;
+}
+
+jfieldID GetControlGroupContainerPointer()
+{
+  return s_control_group_container_pointer;
+}
+
+jmethodID GetControlGroupContainerConstructor()
+{
+  return s_control_group_container_constructor;
+}
+
 jclass GetEmulatedControllerClass()
 {
   return s_emulated_controller_class;
@@ -685,6 +704,16 @@ JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
   s_control_reference_constructor = env->GetMethodID(control_reference_class, "<init>", "(J)V");
   env->DeleteLocalRef(control_reference_class);
 
+  const jclass control_group_container_class = env->FindClass(
+      "org/dolphinemu/dolphinemu/features/input/model/controlleremu/ControlGroupContainer");
+  s_control_group_container_class =
+      reinterpret_cast<jclass>(env->NewGlobalRef(control_group_container_class));
+  s_control_group_container_pointer =
+      env->GetFieldID(control_group_container_class, "pointer", "J");
+  s_control_group_container_constructor =
+      env->GetMethodID(control_group_container_class, "<init>", "(J)V");
+  env->DeleteLocalRef(control_group_container_class);
+
   const jclass emulated_controller_class = env->FindClass(
       "org/dolphinemu/dolphinemu/features/input/model/controlleremu/EmulatedController");
   s_emulated_controller_class =
@@ -754,5 +783,6 @@ JNIEXPORT void JNI_OnUnload(JavaVM* vm, void* reserved)
   env->DeleteGlobalRef(s_numeric_setting_class);
   env->DeleteGlobalRef(s_core_device_class);
   env->DeleteGlobalRef(s_core_device_control_class);
+  env->DeleteGlobalRef(s_control_group_container_class);
 }
 }

Source/Android/jni/AndroidCommon/IDCache.h

@@ -92,6 +92,10 @@ jclass GetControlReferenceClass();
 jfieldID GetControlReferencePointer();
 jmethodID GetControlReferenceConstructor();
 
+jclass GetControlGroupContainerClass();
+jfieldID GetControlGroupContainerPointer();
+jmethodID GetControlGroupContainerConstructor();
+
 jclass GetEmulatedControllerClass();
 jfieldID GetEmulatedControllerPointer();
 jmethodID GetEmulatedControllerConstructor();

Source/Android/jni/Input/EmulatedController.cpp

@@ -20,6 +20,23 @@
 #include "jni/Input/ControlReference.h"
 #include "jni/Input/NumericSetting.h"
 
+ControllerEmu::ControlGroupContainer* ControlGroupContainerFromJava(JNIEnv* env, jobject obj)
+{
+  return reinterpret_cast<ControllerEmu::ControlGroupContainer*>(
+      env->GetLongField(obj, IDCache::GetEmulatedControllerPointer()));
+}
+
+static jobject ControlGroupContainerToJava(JNIEnv* env,
+                                           ControllerEmu::ControlGroupContainer* container)
+{
+  if (!container)
+    return nullptr;
+
+  return env->NewObject(IDCache::GetControlGroupContainerClass(),
+                        IDCache::GetControlGroupContainerConstructor(),
+                        reinterpret_cast<jlong>(container));
+}
+
 ControllerEmu::EmulatedController* EmulatedControllerFromJava(JNIEnv* env, jobject obj)
 {
   return reinterpret_cast<ControllerEmu::EmulatedController*>(
@@ -53,18 +70,18 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedContro
 }
 
 JNIEXPORT jint JNICALL
-Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedController_getGroupCount(
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroupContainer_getGroupCount(
     JNIEnv* env, jobject obj)
 {
-  return static_cast<jint>(EmulatedControllerFromJava(env, obj)->groups.size());
+  return static_cast<jint>(ControlGroupContainerFromJava(env, obj)->groups.size());
 }
 
 JNIEXPORT jobject JNICALL
-Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedController_getGroup(
+Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_ControlGroupContainer_getGroup(
     JNIEnv* env, jobject obj, jint controller_index)
 {
-  return ControlGroupToJava(env,
-                            EmulatedControllerFromJava(env, obj)->groups[controller_index].get());
+  return ControlGroupToJava(
+      env, ControlGroupContainerFromJava(env, obj)->groups[controller_index].get());
 }
 
 JNIEXPORT void JNICALL
@@ -175,7 +192,7 @@ Java_org_dolphinemu_dolphinemu_features_input_model_controlleremu_EmulatedContro
 {
   auto* attachments = static_cast<ControllerEmu::Attachments*>(
       Wiimote::GetWiimoteGroup(controller_index, WiimoteEmu::WiimoteGroup::Attachments));
-  return EmulatedControllerToJava(env, attachments->GetAttachmentList()[attachment_index].get());
+  return ControlGroupContainerToJava(env, attachments->GetAttachmentList()[attachment_index].get());
 }
 
 JNIEXPORT jint JNICALL