Remove Unoffical Mojave/Catalina Root Patching

Feature originally intended for internal developers during early non-Metal development, removed outright due to maintance costs.

For non-TeraScale 2 Acceleration, use dosdude’s tools. For TeraScale 2 acceleration, use 0.4.3 or older

CHANGELOG.md

@@ -45,6 +45,8 @@
 - Remove manual root unpatching
   - Removed due to reliablity issues
   - `bless` based reversion still supported in Big Sur+
+- Remove Unoffical Mojave/Catalina Root Patching
+  - For TeraScale 2-based acceleration on older OSes, use v0.4.3
 
 ## 0.4.3
 - Increment Binaries:

create_offline_build.py

@@ -2,7 +2,7 @@ import subprocess
 from resources import constants
 
 patcher_support_pkg_version = constants.Constants().patcher_support_pkg_version
-binary_packages = ["10.14-Mojave", "10.15-Catalina", "11-Big-Sur", "12-Monterey"]
+binary_packages = ["11-Big-Sur", "12-Monterey"]
 
 for binary_package in binary_packages:
     print(f"- Downloading {binary_package}...")

gui/gui_main.py

@@ -299,11 +299,11 @@ class wx_python_gui:
         )
         self.post_install.Bind(wx.EVT_BUTTON, self.root_patch_menu)
         self.post_install.Centre(wx.HORIZONTAL)
-        if self.constants.detected_os in [os_data.os_data.mojave, os_data.os_data.catalina] and self.constants.moj_cat_accel == False:
-            self.post_install.SetToolTip(wx.ToolTip("""Graphics Acceleration for Mojave and Catalina is currently experimental. \nIf you require this feature, enable '10.14/15 Accel' in Settings."""))
+        if self.constants.detected_os in [os_data.os_data.mojave, os_data.os_data.catalina]:
+            self.post_install.SetToolTip(wx.ToolTip("""Graphics Acceleration for Mojave and Catalina has been removed in 0.4.4 onwards.\n\nIf you require this feature, use 0.4.3 or older"""))
             self.post_install.Disable()
         elif self.constants.detected_os < os_data.os_data.mojave:
-            self.post_install.SetToolTip(wx.ToolTip("""Root Patching is only available for Mojave and newer."""))
+            self.post_install.SetToolTip(wx.ToolTip("""Root Patching is only available for Big Sur and newer."""))
             self.post_install.Disable()
 
         # Create macOS Installer
@@ -1646,13 +1646,6 @@ class wx_python_gui:
         self.bootpicker_checkbox.Bind(wx.EVT_CHECKBOX, self.show_picker_checkbox_click)
         self.bootpicker_checkbox.ToolTip = wx.ToolTip("""Shows OpenCore's Boot Picker on machine start\nToggling this off will hide the picker, and only load when holding either Option or Escape""")
 
-        # Checkbox: Allow Accel on Mojave/Catalina
-        self.accel_checkbox = wx.CheckBox(self.frame, label="Allow Accel on 10.14/15")
-        self.accel_checkbox.SetValue(self.constants.moj_cat_accel)
-        self.accel_checkbox.SetPosition(wx.Point(self.bootpicker_checkbox.GetPosition().x , self.bootpicker_checkbox.GetPosition().y + self.bootpicker_checkbox.GetSize().height))
-        self.accel_checkbox.Bind(wx.EVT_CHECKBOX, self.accel_checkbox_click)
-        self.accel_checkbox.ToolTip = wx.ToolTip("""Allows Root Patching on Mojave/Catalina\nUseful for enabling TeraScale 2 Acceleration when not provided by dosdude1's patcher""")
-
         # Buttons
         
         # Button: SIP Settings
@@ -1663,7 +1656,7 @@ class wx_python_gui:
         else:
             sip_string = "Lowered"
         self.sip_button = wx.Button(self.frame, label=f"SIP Settings ({sip_string})",  size=(155,30))
-        self.sip_button.SetPosition(wx.Point(self.accel_checkbox.GetPosition().x , self.accel_checkbox.GetPosition().y + self.accel_checkbox.GetSize().height + 10))
+        self.sip_button.SetPosition(wx.Point(self.bootpicker_checkbox.GetPosition().x , self.bootpicker_checkbox.GetPosition().y + self.bootpicker_checkbox.GetSize().height + 10))
         self.sip_button.Bind(wx.EVT_BUTTON, self.sip_config_menu)
         self.sip_button.Center(wx.HORIZONTAL)
 
@@ -1779,14 +1772,6 @@ class wx_python_gui:
             print("Show Picker mode disabled")
             self.constants.showpicker = False
     
-    def accel_checkbox_click(self, event=None):
-        if self.accel_checkbox.GetValue():
-            print("Legacy Accel mode enabled")
-            self.constants.moj_cat_accel = True
-        else:
-            print("Legacy Accel mode disabled")
-            self.constants.moj_cat_accel = False
-    
     def dev_settings_menu(self, event=None):
         self.frame.DestroyChildren()
 

resources/arguments.py

@@ -99,9 +99,6 @@ If you plan to create the USB for another machine, please select the "Change Mod
         if self.args.build:
             build.BuildOpenCore(settings.custom_model or settings.computer.real_model, settings).build_opencore()
         elif self.args.patch_sys_vol:
-            if self.args.moj_cat_accel:
-                print("- Set Mojave/Catalina root patch configuration")
-                settings.moj_cat_accel = True
             print("- Set System Volume patching")
 
             if "Library/InstallerSandboxes/" in str(settings.payload_path):

resources/cli_menu.py

@@ -619,34 +619,6 @@ Q. Return to previous menu
         else:
             self.latebloom_settings()
 
-    def allow_moj_cat_patch(self):
-        utilities.cls()
-        utilities.header(["Allow Root Patching on Mojave/Catalina"])
-        print(
-            """
-This is an experimental option that allows the usage of legacy acceleration
-patches in Mojave and Catalina.
-
-The main goal of this is to allow developers to better test patch sets as well
-as allow acceleration on TeraScale 2 machines. Not all features may be available
-(ie. GPU switching may not work, etc)
-
-Note: for the average user, we recommend using dosdude1's legacy patcher:
-
-- http://dosdude1.com/software.html
-        """
-        )
-
-        change_menu = input("Allow Root Patching on Mojave/Catalina?(y/n/q): ")
-        if change_menu in {"y", "Y", "yes", "Yes"}:
-            self.constants.moj_cat_accel = True
-        elif change_menu in {"n", "N", "no", "No"}:
-            self.constants.moj_cat_accel = False
-        elif change_menu in {"q", "Q", "Quit", "quit"}:
-            print("Returning to previous menu")
-        else:
-            self.allow_moj_cat_patch()
-
     def disable_tb(self):
         utilities.cls()
         utilities.header(["Disable Thunderbolt on 2013-14 MacBook Pros"])
@@ -1097,9 +1069,6 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
             print(MenuOptions.monterey)
         elif self.constants.detected_os == os_data.os_data.big_sur:
             print(MenuOptions.big_sur)
-        elif self.constants.detected_os in [os_data.os_data.mojave, os_data.os_data.catalina] and self.constants.moj_cat_accel == True:
-            print(MenuOptions.mojave_catalina)
-            no_unpatch = True
         else:
             print(MenuOptions.default)
             no_patch = True
@@ -1144,10 +1113,6 @@ system_profiler SPHardwareDataType | grep 'Model Identifier'
                 ["Boot Volume Settings", self.patcher_settings_boot],
                 ["Miscellaneous Settings", self.patcher_settings_misc],
                 ["Dump detected hardware", MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).dump_hardware],
-                [
-                    f"Allow Accel on Mojave/Catalina:\tCurrently {self.constants.moj_cat_accel}",
-                    MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).allow_moj_cat_patch,
-                ],
                 [
                     f"Allow OpenCore on native Models:\tCurrently {self.constants.allow_oc_everywhere}",
                     MenuOptions(self.constants.custom_model or self.constants.computer.real_model, self.constants).allow_native_models,

resources/constants.py

@@ -171,7 +171,6 @@ class Constants:
         self.imac_model = "" #         Set MXM GPU model
         self.drm_support = False  #    Set iMac14,x DRM support
         self.allow_ivy_igpu = False  # Set iMac13,x iGPU support
-        self.moj_cat_accel = False  #  Set Mojave/Catalina Acceleration support
         self.allow_ts2_accel = True  # Set TeraScale 2 Acceleration support
 
         ## Miscellaneous

resources/sys_patch_detect.py

@@ -44,10 +44,7 @@ class detect_root_patch:
     
     def detect_gpus(self):
         gpus = self.constants.computer.gpus
-        if self.constants.moj_cat_accel is True:
-            non_metal_os = os_data.os_data.high_sierra
-        else:
-            non_metal_os = os_data.os_data.catalina
+        non_metal_os = os_data.os_data.catalina
         for i, gpu in enumerate(gpus):
             if gpu.class_code and gpu.class_code != 0xFFFFFFFF:
                 print(f"- Found GPU ({i}): {utilities.friendly_hex(gpu.vendor_id)}:{utilities.friendly_hex(gpu.device_id)}")

resources/utilities.py

@@ -479,7 +479,6 @@ def check_cli_args():
     parser.add_argument("--wlan", help="Enable Wake on WLAN support", action="store_true", required=False)
     # parser.add_argument("--disable_amfi", help="Disable AMFI", action="store_true", required=False)
     parser.add_argument("--moderate_smbios", help="Moderate SMBIOS Patching", action="store_true", required=False)
-    parser.add_argument("--moj_cat_accel", help="Allow Root Patching on Mojave and Catalina", action="store_true", required=False)
     parser.add_argument("--disable_tb", help="Disable Thunderbolt on 2013-2014 MacBook Pros", action="store_true", required=False)
     parser.add_argument("--force_surplus", help="Force SurPlus in all newer OSes", action="store_true", required=False)