asd

TheSillyDoggo · Jan 23, 2024 · 5585cb0 · 5585cb0
1 parent 063a98b
commit 5585cb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/mod.json b/mod.json
@@ -17,13 +17,6 @@
 			]
 		}
 	},
-    "incompatibilities": [
-		{
-			"id": "bitz.customprofiles",
-			"version": "*",
-			"importance": "breaking"
-		}
-	],
 	"settings": {
         "apply-profiles": {
             "name": "Apply to Profiles",

diff --git a/src/main.cpp b/src/main.cpp
@@ -29,7 +29,7 @@ class $modify(ProfilePage) {
 	{
 		bool a = ProfilePage::init(accountID, idk);
 
-		if (!Mod::get()->getSettingValue<bool>("apply-profiles"))
+		if (!Mod::get()->getSettingValue<bool>("apply-profiles") || Loader::get()->getLoadedMod("bitz.customprofiles"))
 			return a;
 
 		if (GradientPages::score)
@@ -98,7 +98,7 @@ class $modify(ProfilePage) {
 
 		ProfilePage::loadPageFromUserInfo(score);
 
-		if (!Mod::get()->getSettingValue<bool>("apply-profiles"))
+		if (!Mod::get()->getSettingValue<bool>("apply-profiles") || Loader::get()->getLoadedMod("bitz.customprofiles"))
 			return;
 
 		log::info("loadPageFromUserInfo");
@@ -143,7 +143,7 @@ class $modify (GJAccountSettingsLayer)
 		if (!GJAccountSettingsLayer::init(idk))
 			return false;
 
-		if (!Mod::get()->getSettingValue<bool>("apply-profiles"))
+		if (!Mod::get()->getSettingValue<bool>("apply-profiles") || Loader::get()->getLoadedMod("bitz.customprofiles"))
 			return true;
 
 		auto l = reinterpret_cast<CCLayer*>(this->getChildren()->objectAtIndex(0));
@@ -404,7 +404,7 @@ class $modify(InfoLayer) {
 		if (!InfoLayer::init(level, score, p2))
 			return false;
 
-		if (!Mod::get()->getSettingValue<bool>("apply-info-layer"))
+		if (!Mod::get()->getSettingValue<bool>("apply-info-layer") || Loader::get()->getLoadedMod("bitz.customprofiles"))
 			return true;
 
 		auto l = reinterpret_cast<CCLayer*>(this->getChildren()->objectAtIndex(0));
@@ -473,6 +473,9 @@ class $modify (GJCommentListLayer)
 	{
 		auto a = GJCommentListLayer::create(p0, p1, p2, p3, p4, p5);
 
+		if (Loader::get()->getLoadedMod("bitz.customprofiles"))
+			return a;
+
 		if (!(Mod::get()->getSettingValue<bool>("apply-profiles") || Mod::get()->getSettingValue<bool>("apply-info-layer")))
 			return a;