Skip to content

Commit 3efb1d1

Browse files
committed
sdfgsdfg
1 parent 3aadd85 commit 3efb1d1

File tree

7 files changed

+74
-23
lines changed

7 files changed

+74
-23
lines changed

changelog.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,10 @@
55
- Added Mod Descriptions to Settings Popups
66
- Added ability to move labels to different corners
77
- Added TPS Bypass
8-
- Added Mac Support
98
- Added Main Level Bypass
109
- Added Tower Level Bypass
10+
- Added Slider Limit Bypass
11+
- Added **[<cl>EXPERIMENTAL</c>]** Mac Support
1112

1213
# 1.3.5
1314

src/Client/ClientSetup.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ class ClientUtils
164164
bypass->modules.push_back(new Module("TPS Bypass", "tps-bypass", "Ticks per second bypass, allows your physics to run at values other than 240"));
165165
bypass->modules.push_back(new Module("Comment History Bypass", "comment-history", "Allows you to view the comment history of any user, rob still hasn't fixed this"));
166166

167-
//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>"));
167+
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>"));
168168

169169
Client::instance->windows.push_back(bypass);
170170

src/Client/ColourUtility.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class ColourUtility
66
{
77
public:
88

9-
static geode::prelude::ccColor3B cc3x(int hexValue) {
9+
static cocos2d::ccColor3B cc3x(int hexValue) {
1010
if (hexValue <= 0xf)
1111
return geode::prelude::ccColor3B{
1212
static_cast<GLubyte>(hexValue * 17),

src/Hacks/CloseEndLevelLayer.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
#ifndef GEODE_IS_MACOS
2+
13
#include <Geode/Geode.hpp>
24
#include <Geode/modify/EndLevelLayer.hpp>
35
#include "../Client/Client.h"
46

57
using namespace geode::prelude;
68

7-
89
class EndLevelPopup
910
{
1011
public:
@@ -21,7 +22,7 @@ class EndLevelPopup
2122
CCArray* ar = CCArray::create();
2223
ar->addObject(easeInOutAction);
2324
ar->addObject(CCDelayTime::create(0.1f));
24-
ar->addObject(CCCallFunc::create(arr, callfunc_selector(EndLevelPopup::startArrowOut)));
25+
ar->addObject(CCCallFuncN::create(arr, callfuncN_selector(EndLevelPopup::startArrowOut)));
2526

2627
auto act = CCSequence::create(ar);
2728

@@ -57,7 +58,7 @@ class EndLevelPopup
5758
CCArray* ar = CCArray::create();
5859
ar->addObject(CCEaseInOut::create(CCMoveBy::create(0.25f, ccp(0, 30)), 2.0f));
5960
ar->addObject(CCDelayTime::create(0.1f));
60-
ar->addObject(CCCallFunc::create(arr, callfunc_selector(EndLevelPopup::startIn)));
61+
ar->addObject(CCCallFuncN::create(arr, callfuncN_selector(EndLevelPopup::startIn)));
6162

6263
auto act = CCSequence::create(ar);
6364

@@ -132,4 +133,6 @@ class $modify(EndLevelLayer)
132133
}
133134
}
134135
}
135-
};
136+
};
137+
138+
#endif

src/Hacks/GlobedSecret.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <Geode/Geode.hpp>
1+
/*#include <Geode/Geode.hpp>
22
#include <Geode/modify/GameObject.hpp>
33
#include <Geode/modify/CCScheduler.hpp>
44
#include "../Client/Client.h"
@@ -56,4 +56,4 @@ class $modify (CCScheduler)
5656
"cocos2d::CCNode::setID (Geode)",
5757
tulip::hook::TulipConvention::Thiscall
5858
);
59-
}
59+
}*/

src/Hacks/LevelFix.cpp

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
#include <Geode/Geode.hpp>
2+
#include <Geode/modify/LevelPage.hpp>
3+
#include "../Client/Client.h"
4+
5+
using namespace geode::prelude;
6+
7+
/*class $modify (LevelPage)
8+
{
9+
static LevelPage* create(GJGameLevel* p0)
10+
{
11+
log::info("level: {}", p0);
12+
13+
return LevelPage::create(p0);
14+
}
15+
};*/

src/Hacks/SliderLimit.cpp

Lines changed: 46 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,60 @@
1-
/*#include <Geode/Geode.hpp>
1+
#include <Geode/Geode.hpp>
22
#include <Geode/modify/SliderTouchLogic.hpp>
3-
#include <Geode/modify/Slider.hpp>
3+
#include <Geode/modify/SliderThumb.hpp>
4+
#include <Geode/modify/GJScaleControl.hpp>
45
#include "../Client/Client.h"
56

67
class $modify (SliderTouchLogic)
78
{
89
virtual void ccTouchMoved(cocos2d::CCTouch* p0, cocos2d::CCEvent* p1)
910
{
10-
if (!Client::GetModuleEnabled("slider-limit"))
11-
return SliderTouchLogic::ccTouchMoved(p0, p1);
12-
13-
float w = 100;
14-
float x = (this->convertTouchToNodeSpace(p0).x + 100) / 2;
11+
this->m_thumb->setPositionX(this->convertTouchToNodeSpace(p0).x);
1512

16-
this->m_slider->setValue(x / w);
13+
//this->m_slider->setValue(value);
1714

1815
this->m_slider->updateBar();
1916

20-
CCObject *pTarget = m_thumb->m_pListener;
21-
SEL_MenuHandler pSelector = m_thumb->m_pfnSelector;
22-
23-
if (pTarget && pSelector)
17+
this->m_thumb->activate();
18+
19+
log::info("value: {}", this->m_slider->getValue());
20+
}
21+
22+
static void onModify(auto& self) {
23+
geode::Hook* hook = self.getHook("SliderTouchLogic::ccTouchMoved").unwrap();
24+
25+
Loader::get()->queueInMainThread([hook]
2426
{
25-
(pTarget->*pSelector)(this);
27+
auto modu = Client::GetModule("slider-limit");
28+
29+
hook->setAutoEnable(false);
30+
31+
if (!modu->enabled)
32+
hook->disable();
33+
34+
modu->hooks.push_back(hook);
35+
});
36+
}
37+
};
38+
39+
/*#ifdef GEODE_IS_ANDROID
40+
41+
class $modify (GJScaleControl)
42+
{
43+
virtual void ccTouchMoved(cocos2d::CCTouch* p0, cocos2d::CCEvent* p1)
44+
{
45+
GJScaleControl::ccTouchMoved(p0, p1);
46+
47+
auto slider = getChildOfType<Slider>(this, -1);
48+
auto lbl = getChildOfType<CCLabelBMFont>(this, 2);
49+
50+
if (slider && lbl && slider->isVisible())
51+
{
52+
slider->m_touchLogic->ccTouchMoved(p0, p1);
53+
2654
}
2755
}
28-
};*/
56+
};
57+
58+
#else
59+
60+
#endif*/

0 commit comments

Comments
 (0)