From 277be5b5f6d37d86107226790d3e072a516635d7 Mon Sep 17 00:00:00 2001
From: Explodingbill <talgood09@gmail.com>
Date: Sun, 28 Jul 2024 11:38:48 +1000
Subject: [PATCH] sza

---
 changelog.md                |  2 --
 src/Client/ClientSetup.h    |  4 ++--
 src/Client/Window.cpp       |  2 +-
 src/Hacks/DontFade.cpp      |  4 ++--
 src/Hacks/PracticeAlert.cpp | 12 ++----------
 5 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/changelog.md b/changelog.md
index 399841e..c164186 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,8 +3,6 @@
 - Fixed Crash removing checkpoints with checkpoint limit bypass enabled (thanks @hiimjustin000)
 - Actually fixed not being able to exit practice mode with Comfirm Practice enabled
 - Fixed not being able to scroll in the qolmod popup
-- Added **Force Don't Fade**
-- Added **Force Don't Enter**
 
 # 1.5.1
 
diff --git a/src/Client/ClientSetup.h b/src/Client/ClientSetup.h
index 7ef17fd..2250f6e 100644
--- a/src/Client/ClientSetup.h
+++ b/src/Client/ClientSetup.h
@@ -292,8 +292,8 @@ class ClientUtils
         cosmetic->modules.push_back(new Module("Pulse Menu", "menu-pulse", "Pulses the <cg>Geometry Dash</c> logo on the main menu to the music"));
         cosmetic->modules.push_back(new Module("No \"Do Not\" flip", "just-dont", "Disables the attempt text and endscreen text from being flipped with the <cl>Do Not</c> option enabled."));
 
-        cosmetic->modules.push_back(new Module("Force Don't Fade", "dont-fade", "Forces all object to be Don't Fade"));
-        cosmetic->modules.push_back(new Module("Force Don't Enter", "dont-enter", "Forces all object to be Don't Enter"));
+        //cosmetic->modules.push_back(new Module("Force Don't Fade", "dont-fade", "Forces all object to be Don't Fade"));
+        //cosmetic->modules.push_back(new Module("Force Don't Enter", "dont-enter", "Forces all object to be Don't Enter"));
 
         #ifndef GEODE_IS_ANDROID32
         cosmetic->modules.push_back(new Module("No Player Rotation", "no-rot", "Disables rotation on players"));
diff --git a/src/Client/Window.cpp b/src/Client/Window.cpp
index 8f96ef9..e47bc89 100644
--- a/src/Client/Window.cpp
+++ b/src/Client/Window.cpp
@@ -151,7 +151,7 @@ void Window::cocosCreate(CCMenu* menu)
 
     float gap = 28;
     float extraGap = 9.69f;
-    float height = gap * (roundUpToMultipleOf2((modules.size() - 1) / 2) - 1);
+    float height = gap * roundUpToMultipleOf2((modules.size() - 1) / 2);
     height += gap;
 
     height = std::max<float>(menu->getContentHeight(), height + extraGap);
diff --git a/src/Hacks/DontFade.cpp b/src/Hacks/DontFade.cpp
index cb9206f..9e44cd6 100644
--- a/src/Hacks/DontFade.cpp
+++ b/src/Hacks/DontFade.cpp
@@ -1,4 +1,4 @@
-#include <Geode/Geode.hpp>
+/*#include <Geode/Geode.hpp>
 #include <Geode/modify/PlayLayer.hpp>
 #include "../Client/Client.h"
 
@@ -26,4 +26,4 @@ class $modify(PlayLayer)
     }
 
     QOLMOD_MOD_HOOK("dont-enter", "PlayLayer::addObject")
-};
\ No newline at end of file
+};*/
\ No newline at end of file
diff --git a/src/Hacks/PracticeAlert.cpp b/src/Hacks/PracticeAlert.cpp
index 148bc50..49b9a99 100644
--- a/src/Hacks/PracticeAlert.cpp
+++ b/src/Hacks/PracticeAlert.cpp
@@ -22,7 +22,7 @@ class $modify (PauseLayer)
 
         geode::createQuickPopup(
             "Practice Mode",
-            std::string("Are you sure you want to\n") + std::string(PlayLayer::get()->m_isPracticeMode ? "exit" : "enter") + std::string(" <cg>practice mode</c>?"),
+            "Are you sure you want to\n<cr>exit</c> <cg>Practice Mode</c>?",
             "Cancel", "Practice",
             [this, sender](FLAlertLayer* tis, bool btn2) {
                 if (btn2)
@@ -48,7 +48,7 @@ class $modify (PauseLayer)
 
         geode::createQuickPopup(
             "Practice Mode",
-            "Are you sure you want to\n<cr>exit</c> <cg>practice mode</c>",
+            "Are you sure you want to\n<cy>enter</c> <cg>Practice Mode</c>?",
             "Cancel", "Exit",
             [this, sender](FLAlertLayer* tis, bool btn2) {
                 if (btn2)
@@ -77,11 +77,7 @@ class $modify (PauseLayer)
             "Are you sure you want to\n<cr>restart this level</c>?",
             "Cancel", "Restart",
             [this, sender](FLAlertLayer* tis, bool btn2) {
-                log::info("click restart");
-
                 if (btn2) {
-                    log::info("right btn");
-
                     this->m_fields->a = true;
 
                     this->onRestart(sender);
@@ -106,11 +102,7 @@ class $modify (PauseLayer)
             "Are you sure you want to\n<cr>restart this level</c>?",
             "Cancel", "Restart",
             [this, sender](FLAlertLayer* tis, bool btn2) {
-                log::info("click restart");
-
                 if (btn2) {
-                    log::info("right btn");
-
                     this->m_fields->a = true;
 
                     this->onRestartFull(sender);