Skip to content

Commit bcaab33

Browse files
AlphalaneousAlphalaneous
committed
No more android support
1 parent dcf35c7 commit bcaab33

File tree

9 files changed

+35
-29
lines changed

9 files changed

+35
-29
lines changed

‎.github/workflows/build.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,16 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
config:
15-
#- name: Windows
16-
# os: windows-latest
15+
- name: Windows
16+
os: windows-latest
1717

1818
#- name: Android32
1919
# os: ubuntu-latest
2020
# target: Android32
2121

22-
- name: Android64
23-
os: ubuntu-latest
24-
target: Android64
22+
#- name: Android64
23+
# os: ubuntu-latest
24+
# target: Android64
2525

2626
name: ${{ matrix.config.name }}
2727
runs-on: ${{ matrix.config.os }}

‎mod.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"geode": "4.0.0-beta.1",
33
"gd": {
4-
"win": "2.2074",
5-
"android": "2.2074"
4+
"win": "2.2074"
65
},
76
"version": "v0.9.10",
87
"id": "zalphalaneous.minecraft",

‎src/ui/hooks/CCMenuItemSpriteExtra.h‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,26 +9,22 @@
99
class $modify(MyCCMenuItemSpriteExtra, CCMenuItemSpriteExtra){
1010

1111
struct Fields {
12-
cocos2d::SEL_MenuHandler m_buttonCallback;
13-
CCObject* m_buttonTarget;
1412
bool m_isMCButton = false;
1513
};
1614

1715
bool init(cocos2d::CCNode* p0, cocos2d::CCNode* p1, cocos2d::CCObject* p2, cocos2d::SEL_MenuHandler p3){
18-
m_fields->m_buttonCallback = p3;
19-
m_fields->m_buttonTarget = p2;
2016
return CCMenuItemSpriteExtra::init(p0, p1, p2, p3);
2117
}
2218

23-
/*void selected(){
19+
void selected(){
2420
if(!m_fields->m_isMCButton){
2521
CCMenuItemSpriteExtra::selected();
2622
}
2723
else {
2824
#ifndef GEODE_IS_ANDROID
2925
FMODAudioEngine::sharedEngine()->playEffect("click.ogg"_spr);
3026
#endif
31-
(m_pListener->*m_pfnSelector)(this);
27+
//(m_pListener->*m_pfnSelector)(this);
3228
}
3329
}
3430

@@ -42,7 +38,7 @@ class $modify(MyCCMenuItemSpriteExtra, CCMenuItemSpriteExtra){
4238
if(!m_fields->m_isMCButton){
4339
CCMenuItemSpriteExtra::activate();
4440
}
45-
}*/
41+
}
4642

4743
};
4844

‎src/ui/hooks/CreatorLayer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define convertToMCButton(id, text) \
99
if(auto origButton = this->getChildByIDRecursive(id)){\
1010
if(MyCCMenuItemSpriteExtra* myButton = static_cast<MyCCMenuItemSpriteExtra*>(origButton)){\
11-
MCButton* button = MCButton::create(text, 38.1f, myButton->m_fields->m_buttonTarget, myButton->m_fields->m_buttonCallback);\
11+
MCButton* button = MCButton::create(text, 38.1f, myButton->m_pListener, myButton->m_pfnSelector);\
1212
minecraftButtonMenu->addChild(button);\
1313
}\
1414
}

‎src/ui/hooks/FLAlertLayer.h‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,9 @@ class $modify(MyFLAlertLayer, FLAlertLayer){
161161
}
162162
}
163163

164-
MCButton* btn1 = MCButton::create(text.c_str(), 39.1f, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
164+
MCButton* btn1 = MCButton::create(text.c_str(), 39.1f, button->m_pListener, button->m_pfnSelector);
165165
btn1->setID(button->getID());
166+
btn1->setTag(button->getTag());
166167
button->setVisible(false);
167168
innerButtonMenu->addChild(btn1);
168169
}
@@ -175,7 +176,8 @@ class $modify(MyFLAlertLayer, FLAlertLayer){
175176
}
176177
}
177178

178-
MCButton* btn2 = MCButton::create(text.c_str(), 39.1f, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
179+
MCButton* btn2 = MCButton::create(text.c_str(), 39.1f, button->m_pListener, button->m_pfnSelector);
180+
btn2->setTag(button->getTag());
179181
btn2->setID(button->getID());
180182
button->setVisible(false);
181183
innerButtonMenu->addChild(btn2);

‎src/ui/hooks/MenuLayer.h‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class $modify(MyMenuLayer, MenuLayer) {
9090
MCButton* skinButton = MCButton::create("Skins", 24.0f, this, menu_selector(MenuLayer::onGarage));
9191

9292
MCButton* optionsButton = MCButton::create("Options...", 24.0f, this, menu_selector(MyMenuLayer::onOptions));
93-
MCButton* quitButton = MCButton::create("Quit Game", 24.0f, this, menu_selector(MenuLayer::onQuit));
93+
MCButton* quitButton = MCButton::create("Quit Game", 24.0f, this, menu_selector(MyMenuLayer::onExit));
9494

9595
MCButton* profileButton = MCButton::create("", 5.0f, this, menu_selector(MyMenuLayer::onMyProfile));
9696
MCButton* extrasButton = MCButton::create("", 5.0f, this, menu_selector(MyMenuLayer::onExtras));
@@ -359,4 +359,13 @@ class $modify(MyMenuLayer, MenuLayer) {
359359
creator->setPosition({winSize.width-2,0});
360360
version->setPosition({2,0});
361361
}
362+
363+
void onExit(CCObject* object){
364+
365+
createQuickPopup("Quit Game", "Are you sure you want to <cr>quit</c>?", "Cancel", "Yes", [this](FLAlertLayer*, bool button2){
366+
if(button2){
367+
endGame();
368+
}
369+
});
370+
}
362371
};

‎src/ui/hooks/PauseLayer.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ class $modify(MyPauseLayer, PauseLayer){
117117

118118
if(MyCCMenuItemSpriteExtra* button = static_cast<MyCCMenuItemSpriteExtra*>(getChildByIDRecursive("play-button"))) {
119119

120-
MCButton* btn2 = MCButton::create("Back to Game", 50.0f, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
120+
MCButton* btn2 = MCButton::create("Back to Game", 50.0f, button->m_pListener, button->m_pfnSelector);
121121
btn2->setID(button->getID());
122122
button->setVisible(false);
123123
innerButtonMenu->addChild(btn2);
@@ -134,7 +134,7 @@ class $modify(MyPauseLayer, PauseLayer){
134134
}
135135

136136

137-
MCButton* btn2 = MCButton::create(practiceText.c_str(), 24.3f, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
137+
MCButton* btn2 = MCButton::create(practiceText.c_str(), 24.3f, button->m_pListener, button->m_pfnSelector);
138138
btn2->setID(button->getID());
139139
button->setVisible(false);
140140
innerButtonMenu->addChild(btn2);
@@ -149,7 +149,7 @@ class $modify(MyPauseLayer, PauseLayer){
149149

150150
if(MyCCMenuItemSpriteExtra* button = static_cast<MyCCMenuItemSpriteExtra*>(getChildByIDRecursive("options-button"))) {
151151

152-
MCButton* btn2 = MCButton::create("", 5.0f, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
152+
MCButton* btn2 = MCButton::create("", 5.0f, button->m_pListener, button->m_pfnSelector);
153153
CCSprite* spr = Utils::createPixelSprite("accessibility.png"_spr);
154154
btn2->setID(button->getID());
155155
spr->setPosition({btn2->getContentSize().width/2, btn2->getContentSize().height/2});
@@ -161,7 +161,7 @@ class $modify(MyPauseLayer, PauseLayer){
161161

162162
if(MyCCMenuItemSpriteExtra* button = static_cast<MyCCMenuItemSpriteExtra*>(getChildByIDRecursive("retry-button"))) {
163163

164-
MCButton* btn2 = MCButton::create("Retry", 24.3f, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
164+
MCButton* btn2 = MCButton::create("Retry", 24.3f, button->m_pListener, button->m_pfnSelector);
165165
btn2->setID(button->getID());
166166
button->setVisible(false);
167167
innerButtonMenu->addChild(btn2);
@@ -175,23 +175,23 @@ class $modify(MyPauseLayer, PauseLayer){
175175
buttonSize = 24.3f;
176176
}
177177

178-
MCButton* btn2 = MCButton::create("Edit Level", buttonSize, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
178+
MCButton* btn2 = MCButton::create("Edit Level", buttonSize, button->m_pListener, button->m_pfnSelector);
179179
btn2->setID(button->getID());
180180
button->setVisible(false);
181181
innerButtonMenu->addChild(btn2);
182182
}
183183

184184
if(MyCCMenuItemSpriteExtra* button = static_cast<MyCCMenuItemSpriteExtra*>(getChildByIDRecursive("full-restart-button"))) {
185185

186-
MCButton* btn2 = MCButton::create("Restart Level", buttonSize, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
186+
MCButton* btn2 = MCButton::create("Restart Level", buttonSize, button->m_pListener, button->m_pfnSelector);
187187
btn2->setID(button->getID());
188188
button->setVisible(false);
189189
innerButtonMenu->addChild(btn2);
190190
}
191191

192192
if(MyCCMenuItemSpriteExtra* button = static_cast<MyCCMenuItemSpriteExtra*>(getChildByIDRecursive("exit-button"))) {
193193

194-
MCButton* btn2 = MCButton::create("Quit to Title", 50.0f, button->m_fields->m_buttonTarget, button->m_fields->m_buttonCallback);
194+
MCButton* btn2 = MCButton::create("Quit to Title", 50.0f, button->m_pListener, button->m_pfnSelector);
195195
btn2->setID(button->getID());
196196
button->setVisible(false);
197197
innerButtonMenu->addChild(btn2);

‎src/ui/nodes/MCButtonChild.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ void MCButtonChild::doClick(){
160160
#endif
161161

162162
geode::Loader::get()->queueInMainThread([this]() { //delay it by a frame because for some reason it crashes the touch dispatcher otherwise ???
163-
if(m_pListener && m_pfnSelector){
163+
if (m_pListener && m_pfnSelector) {
164164
(m_pListener->*m_pfnSelector)(this);
165165
}
166166
});

‎src/utils/Utils.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -303,15 +303,15 @@ class Utils {
303303
MCButton* offBtn;
304304

305305
if(auto btn = static_cast<MyCCMenuItemSpriteExtra*>(toggler->m_onButton)){
306-
onBtn = MCButton::create(fmt::format("{}: ON", text), 38.1f, btn->m_fields->m_buttonTarget, btn->m_fields->m_buttonCallback);
306+
onBtn = MCButton::create(fmt::format("{}: ON", text), 38.1f, btn->m_pListener, btn->m_pfnSelector);
307307

308308
}
309309
if(auto btn = static_cast<MyCCMenuItemSpriteExtra*>(toggler->m_offButton)){
310-
offBtn = MCButton::create(fmt::format("{}: OFF", text), 38.1f, btn->m_fields->m_buttonTarget, btn->m_fields->m_buttonCallback);
310+
offBtn = MCButton::create(fmt::format("{}: OFF", text), 38.1f, btn->m_pListener, btn->m_pfnSelector);
311311
}
312312
if(!onBtn || !offBtn) return nullptr;
313313
if(auto btn = static_cast<MyCCMenuItemToggler*>(toggler)){
314-
newToggler = CCMenuItemToggler::create(offBtn, onBtn, btn->m_fields->m_buttonTarget, btn->m_fields->m_buttonCallback);
314+
newToggler = CCMenuItemToggler::create(offBtn, onBtn, btn->m_pListener, btn->m_pfnSelector);
315315
newToggler->setTag(toggler->getTag());
316316
newToggler->setSizeMult(0);
317317

0 commit comments

Comments
 (0)