7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-03-01 07:53:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' of https://github.com/geode-sdk/geode into copy-mods

Browse source
This commit is contained in:
Justin Pridgen 2024-09-10 16:04:54 -04:00
commit b5b845ebb1
4 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGELOG.md
View file

@ -8,9 +8,14 @@
* Add `typeinfo_pointer_cast` for casting `std::shared_ptr`s (28cc6fd)
* Add `GEODE_PLATFORM_SHORT_IDENTIFIER_NOARCH` (1032d9a)
* Add `PlatformID::getCovered` (d5718be)
* Add `limitNodeWidth` and `limitNodeHeight` utils (e8751bf)
* Add `std::hash<WeakRef>` (2d9ce8f)
* Allow limiting image width/height in `MDTextArea` (e8751bf)
* The current working directory is automatically always set to the game directory (7c558ee)
* Rename `toByteArray` to `toBytes` (6eb0797)
* Improve `AxisLayout::getSizeHint` (85e7b5e)
* Fix issues with file dialogs on Windows (62b6241, 971e3fb)
* Fix PCH issues (aedd986)
* Mod incompatibilities may now be platform-specific (9f1c70a)
## v3.5.0

2
loader/src/ui/mods/GeodeStyle.cpp
View file

@ -150,6 +150,7 @@ const char* getGeodeButtonSpriteName(GeodeButtonSprite spr) {
case GeodeButtonSprite::Install: return "GE_button_01.png"_spr;
case GeodeButtonSprite::Delete: return "GJ_button_06.png";
case GeodeButtonSprite::Enable: return "GJ_button_01.png";
case GeodeButtonSprite::Gray: return "GJ_button_05.png";
}
}
else {
@ -159,6 +160,7 @@ const char* getGeodeButtonSpriteName(GeodeButtonSprite spr) {
case GeodeButtonSprite::Install: return "GE_button_01.png"_spr;
case GeodeButtonSprite::Delete: return "GJ_button_06.png";
case GeodeButtonSprite::Enable: return "GJ_button_02.png";
case GeodeButtonSprite::Gray: return "GJ_button_05.png";
}
}
}

1
loader/src/ui/mods/GeodeStyle.hpp
View file

@ -71,6 +71,7 @@ enum class GeodeButtonSprite {
Install,
Delete,
Enable,
Gray,
};
const char* getGeodeButtonSpriteName(GeodeButtonSprite spr);
IconButtonSprite* createGeodeButton(CCNode* icon, std::string const& text, GeodeButtonSprite bg = GeodeButtonSprite::Default);

38
loader/src/ui/mods/list/ModItem.cpp
View file

@ -143,7 +143,7 @@ bool ModItem::init(ModSource&& source) {
auto gdValid = gameVersion == "*" || gameVersion == GEODE_STR(GEODE_GD_VERSION);
if (!geodeValid || !gdValid) {
spr = createGeodeButton("NA", 50, false, true, GeodeButtonSprite::Default);
spr = createGeodeButton("N/A", 50, false, true, GeodeButtonSprite::Gray);
}
}
@ -493,22 +493,26 @@ void ModItem::onView(CCObject*) {
)->show();
}
if (auto serverMod = m_source.asServer(); serverMod != nullptr) {
auto version = serverMod->latestVersion();
auto geodeVersion = version.getGeodeVersion();
auto geodeValid = Loader::get()->isModVersionSupported(geodeVersion);
if (auto res = version.checkGameVersion(); !res) {
FLAlertLayer::create(nullptr, "Unavailable", res.unwrapErr(), "Close", nullptr)->show();
return;
} else if (!geodeValid) {
auto msg = fmt::format(
"Geode {} is required to view this mod. You currently have {}.",
geodeVersion.toVString(),
Loader::get()->getVersion().toVString()
);
FLAlertLayer::create(nullptr, "Unavailable", msg, "Close", nullptr)->show();
return;
// Show popups for invalid mods
if (m_source.asServer()) {
auto version = m_source.asServer()->latestVersion();
if (!Loader::get()->isModVersionSupported(version.getGeodeVersion())) {
return FLAlertLayer::create(
nullptr,
"Outdated",
"This mod is targets an <cr>outdated version of Geode</c>. "
"<co>Please wait for its developer to update it.</c>",
"OK", nullptr, 360
)->show();
}
if (version.getGameVersion() != "*" && version.getGameVersion() != GEODE_STR(GEODE_GD_VERSION)) {
return FLAlertLayer::create(
nullptr,
"Outdated",
"This mod is targets a <cr>different version of Geometry Dash</c>. "
"<co>Please wait for its developer to update it.</c>",
"OK", nullptr, 360
)->show();
}
}