бебебебе

lil2kki · lil2kki · commit 6fa91ef8994f · 2026-03-14T20:38:00.000+04:00
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -10,6 +10,18 @@
       "buildCommandArgs": "",
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "clang_cl_x64" ]
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "variables": []
     }
   ]
 }
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,6 @@
+# v8.0.0-beta.29
+- Migrated from Geode v4.x to v5.3
+
 # v8.0.0-beta.28
 - Fix char filter in listing settings (allow minus)
 - Add IDs Listing editor
diff --git a/include/level.hpp b/include/level.hpp
@@ -160,7 +160,8 @@ namespace level {
         json.set("listPosition", level->m_listPosition); //["listPosition"] = level->m_listPosition;
         json.set("songIDs", std::string_view(level->m_songIDs.c_str())); //["songIDs"] = std::string_view(level->m_songIDs.c_str());
         json.set("sfxIDs", std::string_view(level->m_sfxIDs.c_str())); //["sfxIDs"] = std::string_view(level->m_sfxIDs.c_str());"sfxIDs"] = std::string_view(level->m_sfxIDs.c_str());
-        json.set("field_54", level->m_54); //["field_54"] = level->m_54;
+        json.set("songSize", level->m_songSize); //["field_54"] = level->m_54;
+		json.set("field_54", level->m_songSize); //["field_54"] = level->m_54;  //BACKWARD COMPATIBILITY
         json.set("bestTime", level->m_bestTime); //["bestTime"] = level->m_bestTime;
         json.set("bestPoints", level->m_bestPoints); //["bestPoints"] = level->m_bestPoints;
         json.set("platformerSeed", level->m_platformerSeed); //["platformerSeed"] = level->m_platformerSeed;
@@ -289,7 +290,8 @@ namespace level {
         asInt(listPosition);// = json["listPosition"].asInt().unwrapOr();
         asString(songIDs);// = json["songIDs"].asString().unwrapOr().c_str();
         asString(sfxIDs);// = json["sfxIDs"].asString().unwrapOr().c_str();
-        //asInt(54);// = json["field_54"].asInt().unwrapOr();
+        asInt(songSize);// = json["field_54"].asInt().unwrapOr();
+        level->m_songSize = (json.get("field_54").unwrapOr(json).as<int>().unwrapOr(static_cast<int>(level->m_songSize)));;// = json["field_54"].asInt().unwrapOr();
         asInt(bestTime);// = json["bestTime"].asInt().unwrapOr();
         asInt(bestPoints);// = json["bestPoints"].asInt().unwrapOr();
         asInt(platformerSeed);// = json["platformerSeed"].asInt().unwrapOr();
diff --git a/mod.json b/mod.json
@@ -12,7 +12,7 @@
 	"id": "lr70.main-levels-editor",
 	"name": "Main Levels Editor",
 	"developers": [ "lil2kki" ],
-	"description": "customizable thing to change main levels uknowya",
+	"description": "Main Levels editor at runtime based on config",
 
 	"links": {
 		"community": "https://discord.gg/6SxAbk3bTA",
diff --git a/src/InterfaceFixAndExt.cpp b/src/InterfaceFixAndExt.cpp
@@ -11,8 +11,8 @@ class $modify(MLE_LevelSelectExt, LevelSelectLayer) {
 
     // shared static vars for all LevelSelectLayer objects (same as in namespace declaration).
     inline static int LastPlayedPage, LastPlayedPageLevelID, ForceNextTo;
-    $override void keyDown(cocos2d::enumKeyCodes p0) {
-        LevelSelectLayer::keyDown(p0);
+    $override void keyDown(cocos2d::enumKeyCodes p0, double p1) {
+        LevelSelectLayer::keyDown(p0, p1);
         if (auto scroll = typeinfo_cast<BoomScrollLayer*>(this->m_scrollLayer)) {
             MLE_LevelSelectExt::ForceNextTo = scroll->m_page;
         }
@@ -374,13 +374,14 @@ class $modify(MLE_EditorUI, EditorUI) {
                 }
             );
             //difficulty sprite selector
-            class DiffcltySelector : public Popup<LevelEditorLayer*, std::filesystem::path> {
+            class DiffcltySelector : public Popup {
                 void scrollWheel(float x, float y) override {
                     if (std::fabs(x) > 5.f) if (auto a = m_buttonMenu) if (auto item = a->getChildByType<CCMenuItem>(
                         1 + (x < 0.f)
                     )) item->activate();
                 }
-                bool setup(LevelEditorLayer* editor, std::filesystem::path related_File) override {
+                bool init(LevelEditorLayer* editor, std::filesystem::path related_File) {
+					Popup::init(266.6f, 169.000f);
                     this->setTitle("Select Difficulty Sprite");
                     this->setMouseEnabled(true);
 
@@ -437,7 +438,7 @@ class $modify(MLE_EditorUI, EditorUI) {
             public:
                 static DiffcltySelector* create(LevelEditorLayer* m_editorLayer, std::filesystem::path related_File) {
                     auto ret = new DiffcltySelector();
-                    if (ret->initAnchored(266.6f, 169.000f, m_editorLayer, related_File)) {
+                    if (ret->init(m_editorLayer, related_File)) {
                         ret->autorelease();
                         return ret;
                     }
diff --git a/src/_Main.hpp b/src/_Main.hpp
@@ -186,7 +186,7 @@ class ConfigureLevelFileDataPopup : public geode::Popup {
             auto bgSprite = keyValInput->getBGSprite();
             auto bgSize = bgSprite->getContentSize();
             if (auto* tex = CCTextureCache::get()->addImage("groundSquare_18_001.png", false)) {
-                bgSprite->setTexture(tex);
+                //bgSprite->getInsets(tex);//err
             }
             bgSprite->setContentSize(bgSize);
 
@@ -200,6 +200,8 @@ class ConfigureLevelFileDataPopup : public geode::Popup {
             ->setGrowCrossAxis(1)
             ->setAxisReverse(1)
         );
+        ((ColumnLayout*)scroll->m_contentLayer->getLayout())->ignoreInvisibleChildren(false);
+        scroll->m_contentLayer->updateLayout();
         scroll->scrollToTop();
 
         auto bottomMenuPaddingX = 6.f;
diff --git a/src/_MainLevelsEditorMenu.hpp b/src/_MainLevelsEditorMenu.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-class MLE_MainMenu : public geode::Popup<> {
+class MLE_MainMenu : public geode::Popup {
 protected:
-    using FileEvent = Task<Result<std::filesystem::path>>;
-    EventListener<FileEvent> m_listener;
+    //using FileEvent = Task<Result<std::filesystem::path>>;
+    //EventListener<FileEvent> m_listener;
     static auto resolveListEntry(Ref<TextInput> textinput, Ref<GJGameLevel> level) {
         // parse input
         std::string input = textinput->getString();
@@ -170,7 +170,8 @@ class MLE_MainMenu : public geode::Popup<> {
             menu->addChildAtPosition(item, Anchor::Left, { 4.f, -0.f }, !"nopls");
         }
     }
-    bool setup() override {
+    bool init() override {
+        Popup::init(258.000f, 284.000f);
         this->setTitle("");
 
         //menu
@@ -377,10 +378,11 @@ class MLE_MainMenu : public geode::Popup<> {
                     auto IMPORT_PICK_OPTIONS = file::FilePickOptions{
                         std::nullopt, {{ "Extended Shared Level File", { "*.level" } }}
                     };
-                    __this->m_listener.bind([](FileEvent::Event* e) {
-                        if (e->getValue()) {
-                            if (e->getValue()->isOk()) {
-                                auto path = e->getValue()->unwrap();
+                    async::spawn(
+                        file::pick(file::PickMode::OpenFile, IMPORT_PICK_OPTIONS),
+                        [](Result<std::optional<std::filesystem::path>> e) {
+                            if (e.isOk()) {
+                                auto path = e.unwrapOrDefault().value_or("");
                                 auto exist = CCFileUtils::get()->isFileExist(string::pathToString(path).c_str());
                                 if (!string::endsWith(string::pathToString(path), ".level") and !exist) {
                                     path = std::filesystem::path(string::pathToString(path) + ".level");
@@ -419,11 +421,9 @@ class MLE_MainMenu : public geode::Popup<> {
                                     MDPopup::create("Failed to load level!", level_import.err().value_or("UNK ERROR"), "OK")->show();
                                 }
                             }
-                            else log::error("Something went wrong when picking files: {}", e->getValue()->err());
+                            else log::error("Something went wrong when picking files: {}", e.err());
                         }
-                        else log::error("Something went wrong when picking files: Value is empty.");
-                        });
-                    __this->m_listener.setFilter(file::pick(file::PickMode::OpenFile, IMPORT_PICK_OPTIONS));
+                    );
                 }
             );
             if (menu and load_level) {
@@ -438,10 +438,11 @@ class MLE_MainMenu : public geode::Popup<> {
                     auto IMPORT_PICK_OPTIONS = file::FilePickOptions{
                         std::nullopt, {{ "Extended Shared Level File", { "*.level" } }}
                     };
-                    __this->m_listener.bind([](FileEvent::Event* e) {
-                        if (e->getValue()) {
-                            if (e->getValue()->isOk()) {
-                                auto path = e->getValue()->unwrap();
+                    async::spawn(
+                        file::pick(file::PickMode::OpenFile, IMPORT_PICK_OPTIONS),
+                        [](Result<std::optional<std::filesystem::path>> e) {
+                            if (e.isOk()) {
+                                auto path = e.unwrapOrDefault().value_or("");
                                 auto exist = CCFileUtils::get()->isFileExist(string::pathToString(path).c_str());
                                 if (!string::endsWith(string::pathToString(path), ".level") and !exist) {
                                     path = std::filesystem::path(string::pathToString(path) + ".level");
@@ -456,11 +457,9 @@ class MLE_MainMenu : public geode::Popup<> {
                                     MDPopup::create("Failed to load level!", level_import.err().value_or("UNK ERROR"), "OK")->show();
                                 }
                             }
-                            else log::error("Something went wrong when picking files: {}", e->getValue()->err());
+                            else log::error("Something went wrong when picking files: {}", e.err());
                         }
-                        else log::error("Something went wrong when picking files: Value is empty.");
-                        });
-                    __this->m_listener.setFilter(file::pick(file::PickMode::OpenFile, IMPORT_PICK_OPTIONS));
+                    );
                 }
             );
             if (menu and edit_level) {
@@ -537,11 +536,11 @@ class MLE_MainMenu : public geode::Popup<> {
                         getMod()->getConfigDir() / fmt::format("{}.level", level->m_levelID.value()),
                         {{ "Extended Shared Level File", { "*.level" } }}
                     };
-                    __this->m_listener.bind([level](FileEvent::Event* e) {
-                        if (e->getValue()) {
-                            if (e->getValue()->isOk()) {
-                                //path
-                                auto path = e->getValue()->unwrap();
+                    async::spawn(
+                        file::pick(file::PickMode::SaveFile, IMPORT_PICK_OPTIONS),
+                        [level](Result<std::optional<std::filesystem::path>> e) {
+                            if (e.isOk()) {
+                                auto path = e.unwrapOrDefault().value_or("");
                                 path = string::endsWith(string::pathToString(path), ".level"
                                 ) ? string::pathToString(path) : (string::pathToString(path) + ".level");
                                 //dir
@@ -595,14 +594,10 @@ class MLE_MainMenu : public geode::Popup<> {
                                 }
                             }
                             else {
-                                log::error("Something went wrong when picking files: {}", e->getValue()->err());
+                                log::error("Something went wrong when picking files: {}", e.err());
                             }
                         }
-                        else {
-                            log::error("Something went wrong when picking files: Value is empty.");
-                        }
-                        });
-                    __this->m_listener.setFilter(file::pick(file::PickMode::SaveFile, IMPORT_PICK_OPTIONS));
+                    );
                 }
             );
             if (menu and export_level) {
@@ -989,7 +984,7 @@ class MLE_MainMenu : public geode::Popup<> {
             ->setGrowCrossAxis(true)
             ->setCrossAxisOverflow(false)
         );
-        menu->getLayout()->ignoreInvisibleChildren(true); //lol
+        ((ColumnLayout*)menu->getLayout())->ignoreInvisibleChildren(true); //lol
         menu->updateLayout(); //xd ^^^
         limitNodeWidth(menu, this->m_mainLayer->getContentWidth() - 16.f, 1.f, 0.1f);
 
@@ -998,7 +993,7 @@ class MLE_MainMenu : public geode::Popup<> {
 public:
     static MLE_MainMenu* create() {
         auto ret = new MLE_MainMenu();
-        if (ret->initAnchored(258.000f, 284.000f)) {
+        if (ret->init()) {
             ret->autorelease();
             return ret;
         }

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,18 @@`
`10`	`10`	`"buildCommandArgs": "",`
`11`	`11`	`"ctestCommandArgs": "",`
`12`	`12`	`"inheritEnvironments": [ "clang_cl_x64" ]`
	`13`	`+ },`
	`14`	`+ {`
	`15`	`+ "name": "x64-Release",`
	`16`	`+ "generator": "Ninja",`
	`17`	`+ "configurationType": "RelWithDebInfo",`
	`18`	`+ "buildRoot": "${projectDir}\\out\\build\\${name}",`
	`19`	`+ "installRoot": "${projectDir}\\out\\install\\${name}",`
	`20`	`+ "cmakeCommandArgs": "",`
	`21`	`+ "buildCommandArgs": "",`
	`22`	`+ "ctestCommandArgs": "",`
	`23`	`+ "inheritEnvironments": [ "msvc_x64_x64" ],`
	`24`	`+ "variables": []`
`13`	`25`	`}`
`14`	`26`	`]`
`15`	`27`	`}`