ok stuff

changelog.md

@@ -4,7 +4,10 @@
 - Fixed button not being clickable on the pause menu
 - Re enable text bypasses
 - Fix incorrect menu speed during transition
+- Re-added the text bypasses due to hopefully fixing the crashes
 - Added Transparent BG & Transparent Lists
+- Added Confirm Practice and Confirm Restart
+- Fixed show hitboxes breaking (vanilla one)
 
 # 1.1.0
 

src/Client/ClientSetup.h

@@ -84,6 +84,9 @@ class ClientUtils
         bypass->modules.push_back(new Module("Character Limit", "char-limit", "Removes the <cl>character limit</c> on input fields"));
         bypass->modules.push_back(new Module("Character Filter", "char-filter", "Allows you to input <cg>any</c> character in input fields"));
 
+        bypass->modules.push_back(new Module("Confirm Practice", "conf-prac", "confirm practice mode help"));
+        bypass->modules.push_back(new Module("Confirm Restart", "conf-res", "confirm restart help"));
+
         #ifdef GEODE_IS_ANDROID
         //bypass->modules.push_back(new Module("Slider Limit Bypass", "slider-limit", "Allows sliders to go beyond the limit of the slider. <cr>Doesn't work for scaling in the editor currently</c>"));
         #endif

src/Hacks/NoWavePulse.cpp

@@ -0,0 +1,18 @@
+/*#include <Geode/Geode.hpp>
+#include <Geode/modify/HardStreak.hpp>
+#include "../Client/Client.h"
+
+using namespace geode::prelude;
+
+class $modify (HardStreak)
+{   
+    void updateStroke(float p0)
+    {
+        // 2.1 bindings don't work sad
+        m_pulseSize = 25;
+
+        log::info("unk: {}", p0);
+
+        HardStreak::updateStroke(p0);
+    }
+};*/

src/Hacks/PracticeAlert.cpp

@@ -1,36 +1,70 @@
-/*#include <Geode/Geode.hpp>
+#include <Geode/Geode.hpp>
 #include <Geode/modify/PauseLayer.hpp>
 #include "../Client/Client.h"
 
 using namespace geode::prelude;
 
 class $modify (PauseLayer)
 {
-    void onPrac(float dt)
-    {
-        log::info("alert clicked");
-    }
+    bool v = false;
 
     void onPracticeMode(cocos2d::CCObject* sender)
     {
-        if (PlayLayer::get()->m_isPracticeMode)
-            { PlayLayer::get()->resetLevelFromStart(); PlayLayer::get()->togglePracticeMode(false); PlayLayer::get()->pauseGame(false); return; }
-        
+        if (PlayLayer::get()->m_isPracticeMode || m_fields->v || !Client::GetModuleEnabled("conf-prac"))
+        {
+            PauseLayer::onPracticeMode(sender);
+
+            return;
+        }        
 
         geode::createQuickPopup(
             "Practice Mode",
             "Are you sure you want to\nenter <cg>practice mode</c>?",
             "Cancel", "Practice",
-            [](FLAlertLayer* tis, bool btn2) {
+            [this, sender](FLAlertLayer* tis, bool btn2) {
                 log::info("click practice");
 
                 if (btn2) {
                     log::info("right btn");
 
-                    PlayLayer::get()->togglePracticeMode(true);
-                    PlayLayer::get()->pauseGame(false);
+                    this->m_fields->v = true;
+
+                    this->onPracticeMode(sender);
+
+                    this->m_fields->v = false;
+                }
+            }
+        );
+    }
+
+    bool a = false;
+
+    void onRestart(cocos2d::CCObject* sender)
+    {
+        if (m_fields->a || !Client::GetModuleEnabled("conf-res"))
+        {
+            PauseLayer::onRestart(sender);
+
+            return;
+        }        
+
+        geode::createQuickPopup(
+            "Restart Leevl",
+            "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);
+
+                    this->m_fields->a = false;
                 }
             }
         );
     }
-};*/
+};

src/Hacks/SolidWaveTrail.cpp

@@ -17,7 +17,7 @@ bool myDrawCircle(CCDrawNode* ins, CCPoint *verts, unsigned int count, const ccC
         ins->setZOrder(-1);
     }
 
-    return ins->drawPolygon(verts, count, fillColor, borderWidth, fillColor);
+    return ins->drawPolygon(verts, count, fillColor, borderWidth, borderColor);
 }
 
 $execute {

src/Replay/Macro.h

@@ -1,5 +1,5 @@
 #include <Geode/Geode.hpp>
-#include <Geode/modify/EndLevelLayer.hpp>
+#include <Geode/modify/PauseLayer.hpp>
 #include "../Client/Client.h"
 
 using namespace geode::prelude;

src/Replay/Replay.cpp

@@ -1 +1,14 @@
-#include "Macro.h"
+/*#include "Macro.h"
+
+class $modify (PauseLayer)
+{
+    virtual TodoReturn customSetup()
+    {
+        PauseLayer::customSetup();
+
+        //auto m = CCMenu::create(CCMenuItemSpriteExtra::create(CCSprite::createWithSpriteFrameName("GJ_achImage_001.png"), this, nullptr));
+
+        //this->addChild(m);
+    }
+    //TodoReturn setupReplay(gd::string)
+};*/