changes

OmgRod · Jan 12, 2025 · 9a4c0b8 · 9a4c0b8
1 parent 7e3ab38
commit 9a4c0b8
Show file tree

Hide file tree

Showing 53 changed files with 179 additions and 65 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@ class $modify(MyCreatorLayer, CreatorLayer) {
 
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-2);
-			swelvyBG->setID("swelvy-background");
+			
 
 			this->addChild(swelvyBG);
 		}
@@ -80,7 +80,7 @@ HookClass(GlobedLevelListLayer) {
 
         SwelvyBG* swelvyBG = SwelvyBG::create();
         swelvyBG->setZOrder(-1);
-        swelvyBG->setID("swelvy-background");
+        
         this->addChild(swelvyBG);
 }
 
@@ -104,7 +104,7 @@ HookClass_Scene(cvolton_betterinfo_CustomCreatorLayer,"cvolton.betterinfo/Custom
             bg->setVisible(false);
             SwelvyBG* swelvyBG = SwelvyBG::create();
             swelvyBG->setZOrder(-1);
-            swelvyBG->setID("swelvy-background");
+            
             _This->addChild(swelvyBG);
         }
 }

diff --git a/mod.json b/mod.json
@@ -12,14 +12,20 @@
 	"description": "Converts most menus' backgrounds to the Geode one (SwelvyBG).",
 	"early-load": true,
 	"resources": {
-        "sprites": [
-            "res/previews/*.png"
-        ],
+        "spritesheets": {
+            "previewSheet": [
+                "res/previews/*.png"
+            ]
+        },
         "files": [
             "res/layers.json"
         ]
 	},
 	"settings": {
+        "color-title": {
+            "type": "title",
+            "name": "Color Offset Settings"
+        },
         "enable-color": {
             "name": "Enable Color Offset",
             "description": "Enables color offset for the SwelvyBG.",
@@ -68,6 +74,10 @@
             "default": "113,74,154",
             "enable-if": "enable-color"
         },
+        "gd-title": {
+            "type": "title",
+            "name": "Geometry Dash"
+        },
         "show-main": {
             "name": "Show in main menu",
             "description": "MenuLayer",
@@ -194,6 +204,10 @@
             "type": "bool",
             "default": true
         },
+        "mods-title": {
+            "type": "title",
+            "name": "Mods Settings"
+        },
         "external-mods": {
             "name": "external mods",
             "description": "For external mod layers",

diff --git a/src/SwelvyBG.cpp b/src/SwelvyBG.cpp
@@ -11,6 +11,7 @@ bool SwelvyBG::init(float widthmult, float hightmult, float minspeed, float maxs
     auto winSize = CCDirector::get()->getWinSize();
     this->setContentSize(winSize);
     this->setAnchorPoint({ 0.f, 0.f });
+    this->setID("swelvy-background"_spr);
 
     std::random_device rd;
     std::mt19937 gen(rd());

diff --git a/src/layers/GYModTile.cpp b/src/layers/GYModTile.cpp
@@ -0,0 +1,34 @@
+#include <Geode/Geode.hpp>
+
+#include "GYModTile.hpp"
+
+using namespace geode::prelude;
+
+GYModTile* GYModTile::create() {
+    GYModTile* ret = new GYModTile();
+    if (ret && ret->init()) {
+        ret->autorelease();
+        return ret;
+    }
+    delete ret;
+    return nullptr;
+}
+
+bool GYModTile::init() {
+    if (!CCLayer::init())
+        return false;
+
+    setMouseEnabled(true);
+
+    auto winSize = CCDirector::sharedDirector()->getWinSize();
+
+    this->setContentSize({ winSize.width * 0.325f, winSize.height * 0.4f });
+
+    // GJ_square04.png - The purple one
+    auto bg = CCScale9Sprite::create("GJ_square04.png");
+    bg->setContentSize(this->getContentSize());
+    bg->setAnchorPoint({ 0.f, 0.f});
+    this->addChild(bg);
+
+    return true;
+}
diff --git a/src/layers/GYModTile.hpp b/src/layers/GYModTile.hpp
@@ -0,0 +1,11 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+using namespace geode::prelude;
+
+class GYModTile : public CCLayer {
+public:
+    static GYModTile* create();
+    bool init();
+};
diff --git a/src/layers/GYSettingSelectLayer.cpp b/src/layers/GYSettingSelectLayer.cpp
@@ -1,6 +1,7 @@
 #include <Geode/Geode.hpp>
 #include <Geode/ui/ScrollLayer.hpp>
-#include "../json.hpp"
+#include <Geode/ui/GeodeUI.hpp>
+#include <Geode/ui/BasedButtonSprite.hpp>
 #include <filesystem>
 #include <fstream>
 #include <sstream>
@@ -10,6 +11,8 @@
 
 #include "GYSettingSelectLayer.hpp"
 #include "GYScreenshotPopup.hpp"
+#include "GYModTile.hpp"
+#include "../json.hpp"
 
 using namespace geode::prelude;
 
@@ -51,6 +54,10 @@ void GYSettingSelectLayer::settingsBtn(CCObject* sender) {
     CCDirector::sharedDirector()->pushScene(scenePrev);
 }
 
+void GYSettingSelectLayer::openNormalSettings(CCObject* sender) {
+    openSettingsPopup(Mod::get());
+}
+
 bool GYSettingSelectLayer::init() {
     if (!CCLayer::init())
         return false;
@@ -70,6 +77,19 @@ bool GYSettingSelectLayer::init() {
     background->setPosition({ winSize.width / 2, winSize.height / 2 });
     this->addChild(background);
 
+    auto cornerLeft = CCSprite::createWithSpriteFrameName("GJ_sideArt_001.png");
+    cornerLeft->setPosition(CCPoint(winSize.width * 0, winSize.height * 0));
+    cornerLeft->setAnchorPoint(CCPoint(0, 0));
+    cornerLeft->setID("corner-left");
+    this->addChild(cornerLeft);
+
+    auto cornerRight = CCSprite::createWithSpriteFrameName("GJ_sideArt_001.png");
+    cornerRight->setPosition(CCPoint(winSize.width * 1, winSize.height * 0));
+    cornerRight->setAnchorPoint(CCPoint(1, 0));
+    cornerRight->setFlipX(true);
+    cornerRight->setID("corner-right");
+    this->addChild(cornerRight);
+
     auto backBtn = CCMenuItemSpriteExtra::create(
         CCSprite::createWithSpriteFrameName("GJ_arrow_01_001.png"),
         this,
@@ -86,11 +106,17 @@ bool GYSettingSelectLayer::init() {
 
     auto contentBox = CCScale9Sprite::create("GJ_square01.png");
     contentBox->setContentSize({ winSize.width * 0.7f, winSize.height * 0.7f });
-    contentBox->setPosition({ winSize.width / 2, (winSize.height / 2) - (winSize.height * 0.05f) });
+    contentBox->setPosition({ winSize.width / 2, winSize.height / 2 - winSize.height * 0.05f });
     contentBox->setAnchorPoint({ 0.5f, 0.5f });
     contentBox->setID("content-box");
     this->addChild(contentBox);
 
+    ScrollLayer* scroll = ScrollLayer::create({ winSize.width * 0.7f, winSize.height * 0.7f }, true, true);
+    scroll->setID("scroll");
+    contentBox->addChild(scroll);
+
+    scroll->m_contentLayer->setLayout(ColumnLayout::create()->setAxisReverse(true));
+
     auto leftMenu = CCMenu::create();
     leftMenu->setAnchorPoint({ 0, 0 });
     leftMenu->setContentSize({ 0.f, winSize.height * 0.6f });
@@ -111,21 +137,41 @@ bool GYSettingSelectLayer::init() {
         menu_selector(GYSettingSelectLayer::generateWrapper)
     );
     colorBtn->setID("color-button");
-
     leftMenu->addChild(colorBtn);
 
-    leftMenu->updateLayout();
+    auto settingsBtn = CCMenuItemSpriteExtra::create(
+        CircleButtonSprite::create(
+            CCSprite::createWithSpriteFrameName("geode.loader/settings.png"),
+            CircleBaseColor::DarkPurple,
+            CircleBaseSize::Medium
+        ),
+        this,
+        menu_selector(GYSettingSelectLayer::openNormalSettings)
+    );
+    settingsBtn->setID("settings-button");
+    leftMenu->addChild(settingsBtn);
 
-    // auto testBtn = CCMenuItemSpriteExtra::create(
-    //     CCSprite::createWithSpriteFrameName(
-    //         "GJ_paintBtn_001.png"
-    //     ),
-    //     this,
-    //     menu_selector(GYSettingSelectLayer::popup)
-    // );
+    leftMenu->updateLayout();
 
-    // testBtn->setPosition(winSize.width * 0.5, winSize.height * 0.5);
-    // menu->addChild(testBtn);
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+    scroll->m_contentLayer->addChild(GYModTile::create());
+
+    GYSettingSelectLayer::generateModsList();
 
     this->addChild(leftMenu);
     this->addChild(menu);
@@ -227,5 +273,12 @@ bool GYSettingSelectLayer::generateModsList() {
         log::warn("No valid 'layers' data found in JSON");
     }
 
+    ScrollLayer* scroll = typeinfo_cast<ScrollLayer*>(this->getChildByID("content-box")->getChildByID("scroll"));
+    if (!scroll) {
+        log::error("Failed to cast content-box->scroll to ScrollLayer");
+        return false;
+    }
+    scroll->m_contentLayer->updateLayout();
+
     return true;
 }
diff --git a/src/layers/GYSettingSelectLayer.hpp b/src/layers/GYSettingSelectLayer.hpp
@@ -13,5 +13,6 @@ class GYSettingSelectLayer : public CCLayer {
     void settingsBtn(CCObject* sender);
     void backWrapper(CCObject* sender);
     void generateWrapper(CCObject* sender);
+    void openNormalSettings(CCObject* sender);
     bool generateModsList();
 };
diff --git a/src/modify/CreatorLayer.cpp b/src/modify/CreatorLayer.cpp
@@ -16,7 +16,7 @@ class $modify(MyCreatorLayer, CreatorLayer) {
 
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-2);
-			swelvyBG->setID("swelvy-background");
+
 
 			this->addChild(swelvyBG);
 		}

diff --git a/src/modify/EditLevelLayer.cpp b/src/modify/EditLevelLayer.cpp
@@ -30,7 +30,7 @@ class $modify(MyEditLevelLayer, EditLevelLayer) {
 
             auto swelvyBG = SwelvyBG::create();
             swelvyBG->setZOrder(-2);
-            swelvyBG->setID("swelvy-background");
+
 
             this->addChild(swelvyBG);
         }

diff --git a/src/modify/GJGarageLayer.cpp b/src/modify/GJGarageLayer.cpp
@@ -16,7 +16,7 @@ class $modify(MyGJGarageLayer, GJGarageLayer) {
 
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-2);
-			swelvyBG->setID("swelvy-background");
+
 
 			this->addChild(swelvyBG);
 		}

diff --git a/src/modify/GauntletLayer.cpp b/src/modify/GauntletLayer.cpp
@@ -15,7 +15,7 @@ class $modify(MyGauntletLayer, GauntletLayer) {
 
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-2);
-			swelvyBG->setID("swelvy-background");
+
 
 			this->addChild(swelvyBG);
 		}

diff --git a/src/modify/GauntletSelectLayer.cpp b/src/modify/GauntletSelectLayer.cpp
@@ -16,7 +16,7 @@ class $modify(MyGauntletSelectLayer, GauntletSelectLayer) {
 
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-2);
-			swelvyBG->setID("swelvy-background");
+
 
 			this->addChild(swelvyBG);
 		}

diff --git a/src/modify/LeaderboardsLayer.cpp b/src/modify/LeaderboardsLayer.cpp
@@ -16,7 +16,7 @@ class $modify(MyLeaderboardsLayer, LeaderboardsLayer) {
 
 		auto swelvyBG = SwelvyBG::create();
 		swelvyBG->setZOrder(-3);
-		swelvyBG->setID("swelvy-background");
+
 
     	this->addChild(swelvyBG);
 

diff --git a/src/modify/LevelAreaInnerLayer.cpp b/src/modify/LevelAreaInnerLayer.cpp
@@ -12,7 +12,7 @@ class $modify(MyLevelAreaInnerLayer, LevelAreaInnerLayer) {
 		if (Mod::get()->getSettingValue<bool>("show-inner-tower")){
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-2);
-			swelvyBG->setID("swelvy-background");
+
 
 			this->addChild(swelvyBG);
 		}

diff --git a/src/modify/LevelAreaLayer.cpp b/src/modify/LevelAreaLayer.cpp
@@ -14,7 +14,7 @@ class $modify(MyLevelAreaLayer, LevelAreaLayer) {
 				bg->setVisible(false);
 				auto swelvyBG = SwelvyBG::create();
 				swelvyBG->setZOrder(-2);
-				swelvyBG->setID("swelvy-background");
+
 
 				this->addChild(swelvyBG);				
 			}

diff --git a/src/modify/LevelBrowserLayer.cpp b/src/modify/LevelBrowserLayer.cpp
@@ -14,7 +14,7 @@ class $modify(MyLevelBrowserLayer, LevelBrowserLayer) {
 				bg->setVisible(false);
 				auto swelvyBG = SwelvyBG::create();
 				swelvyBG->setZOrder(-2);
-				swelvyBG->setID("swelvy-background");
+
 
 				this->addChild(swelvyBG);				
 			}

diff --git a/src/modify/LevelInfoLayer.cpp b/src/modify/LevelInfoLayer.cpp
@@ -16,7 +16,7 @@ class $modify(MyLevelInfoLayer, LevelInfoLayer) {
 
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-2);
-			swelvyBG->setID("swelvy-background");
+
 
 			this->addChild(swelvyBG);
 		}

diff --git a/src/modify/LevelListLayer.cpp b/src/modify/LevelListLayer.cpp
@@ -14,7 +14,7 @@ class $modify(MyLevelListLayer, LevelListLayer) {
 				bg->setVisible(false);
 				auto swelvyBG = SwelvyBG::create();
 				swelvyBG->setZOrder(-2);
-				swelvyBG->setID("swelvy-background");
+
 
 				this->addChild(swelvyBG);							
 			}

diff --git a/src/modify/LevelSearchLayer.cpp b/src/modify/LevelSearchLayer.cpp
@@ -48,7 +48,7 @@ class $modify(MyLevelSearchLayer, LevelSearchLayer) {
 
 			auto swelvyBG = SwelvyBG::create();
 			swelvyBG->setZOrder(-3);
-			swelvyBG->setID("swelvy-background");
+
 
     		this->addChild(swelvyBG);
 		}

diff --git a/src/modify/LevelSelectLayer.cpp b/src/modify/LevelSelectLayer.cpp
@@ -19,7 +19,7 @@ class $modify(MyLevelSelectLayer, LevelSelectLayer) {
 
 		auto swelvyBG = SwelvyBG::create();
 		swelvyBG->setZOrder(-3);
-		swelvyBG->setID("swelvy-background");
+
 
     	this->addChild(swelvyBG);
 		}

diff --git a/src/modify/LoadingLayer.cpp b/src/modify/LoadingLayer.cpp
@@ -16,7 +16,7 @@ class $modify(MyLoadingLayer, LoadingLayer) {
 
 		auto swelvyBG = SwelvyBG::create();
 		swelvyBG->setZOrder(-3);
-		swelvyBG->setID("swelvy-background");
+
 
     	this->addChild(swelvyBG);