From 9fb2efee8d22afa31428a218f2e70bc337180c89 Mon Sep 17 00:00:00 2001
From: Mykola Grymalyuk <khronokernel@icloud.com>
Date: Thu, 9 Jun 2022 14:37:01 -0600
Subject: [PATCH] Fix Top case bundle pathing

---
 payloads/Config/config.plist | 56 +++++++++++++++++++++++++++++++++++-
 resources/build.py           |  3 ++
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/payloads/Config/config.plist b/payloads/Config/config.plist
index 6e7f8759d..29438cf65 100644
--- a/payloads/Config/config.plist
+++ b/payloads/Config/config.plist
@@ -1267,7 +1267,61 @@
 				<key>Enabled</key>
 				<false/>
 				<key>ExecutablePath</key>
-				<string>Contents/MacOS/AppleUSBTopCase</string>
+				<string></string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCButtons.kext</string>
+				<key>Comment</key>
+				<string>AppleUSBTCButtons</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBTCButtons</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyboard.kext</string>
+				<key>Comment</key>
+				<string>AppleUSBTCKeyboard</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBTCKeyboard</string>
+				<key>MaxKernel</key>
+				<string></string>
+				<key>MinKernel</key>
+				<string>22.0.0</string>
+				<key>PlistPath</key>
+				<string>Contents/Info.plist</string>
+			</dict>
+			<dict>
+				<key>Arch</key>
+				<string>x86_64</string>
+				<key>BundlePath</key>
+				<string>AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyEventDriver.kext</string>
+				<key>Comment</key>
+				<string>AppleUSBTCKeyEventDriver</string>
+				<key>Enabled</key>
+				<false/>
+				<key>ExecutablePath</key>
+				<string>Contents/MacOS/AppleUSBTCKeyEventDriver</string>
 				<key>MaxKernel</key>
 				<string></string>
 				<key>MinKernel</key>
diff --git a/resources/build.py b/resources/build.py
index d4f577f6d..0c91d29d4 100644
--- a/resources/build.py
+++ b/resources/build.py
@@ -771,6 +771,9 @@ class BuildOpenCore:
                 # These units got force touch early, so ignore them
                 if self.model not in ["MacBookPro11,4", "MacBookPro11,5", "MacBook8,1"]:
                     self.enable_kext("AppleUSBTopCase.kext", self.constants.topcase_version, self.constants.top_case_path)
+                    self.get_kext_by_bundle_path("AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCButtons.kext")["Enabled"] = True
+                    self.get_kext_by_bundle_path("AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyboard.kext")["Enabled"] = True
+                    self.get_kext_by_bundle_path("AppleUSBTopCase.kext/Contents/PlugIns/AppleUSBTCKeyEventDriver.kext")["Enabled"] = True
                     self.enable_kext("AppleUSBMultitouch.kext", self.constants.multitouch_version, self.constants.multitouch_path)