no wave trail and solid wave trail on mac

Author: TheSillyDoggo

src/Client/ClientSetup.h

@@ -399,8 +399,6 @@ class ClientUtils
             "no-trans",
             "verify-hack",
             "coin-tracers",
-            "no-wave",
-            "solid-wave",
             "no-shake"
         };
 

src/Hacks/SolidWaveTrail.cpp

@@ -1,53 +1,42 @@
-#ifndef GEODE_IS_MACOS
-
 #include <Geode/Geode.hpp>
+#include <Geode/modify/CCDrawNode.hpp>
 #include "../Client/Client.h"
 
 using namespace geode::prelude;
 
 Module* noWave = nullptr;
 Module* solidWave = nullptr;
 
-bool myDrawCircle(CCDrawNode* ins, CCPoint *verts, unsigned int count, const ccColor4F &fillColor, float borderWidth, const ccColor4F &borderColor) {
-
-    if (typeinfo_cast<HardStreak*>(ins))
+class $modify (CCDrawNode)
+{
+    bool drawPolygon(CCPoint *verts, unsigned int count, const ccColor4F &fillColor, float borderWidth, const ccColor4F &borderColor)
     {
-        if (!noWave)
-            noWave = Client::GetModule("no-wave");
-
-        if (!solidWave)
-            solidWave = Client::GetModule("solid-wave");
+        if (typeinfo_cast<HardStreak*>(this))
+        {
+            if (!noWave)
+                noWave = Client::GetModule("no-wave");
 
-        if (noWave->enabled)
-            return true;
+            if (!solidWave)
+                solidWave = Client::GetModule("solid-wave");
 
-        if (solidWave->enabled)
-        {
-            if (fillColor.r >= 1.0f && fillColor.g >= 1.0f && fillColor.b >= 1.0f && ins->getColor() != ccc3(255, 255, 255))
+            if (noWave->enabled)
                 return true;
 
-            if (ins->getTag() != 1)
+            if (solidWave->enabled)
             {
-                ins->setTag(1);
-                ins->setBlendFunc(CCSprite::create()->getBlendFunc());
-            }
+                if (fillColor.r >= 1.0f && fillColor.g >= 1.0f && fillColor.b >= 1.0f && this->getColor() != ccc3(255, 255, 255))
+                    return true;
+
+                if (this->getTag() != 1)
+                {
+                    this->setTag(1);
+                    this->setBlendFunc(CCSprite::create()->getBlendFunc());
+                }
 
-            ins->setZOrder(-1);
+                this->setZOrder(-1);
+            }
         }
-    }
 
-    return ins->drawPolygon(verts, count, fillColor, borderWidth, borderColor);
-}
-
-$execute {
-    Mod::get()->hook(
-        reinterpret_cast<void*>(
-            geode::addresser::getNonVirtual(&HardStreak::drawPolygon)
-        ),
-        &myDrawCircle,
-        "cocos2d::CCDrawNode::drawPolygon",
-        tulip::hook::TulipConvention::Thiscall
-    );
-}
-
-#endif
+        return CCDrawNode::drawPolygon(verts, count, fillColor, borderWidth, borderColor);
+    }
+};