Merge #19 v1.1.0

v1.1.0

README.md

@@ -8,26 +8,26 @@ Click on the rating button (the red square) to see information about enjoyment a
 If the rating doesn't load, <cb>refresh</c> the level page (It happens sometimes if you have the level saved already)
 The button can be moved to the level name (there's a setting for that)
 
+You can search for levels based on their tier or enjoyment rating, completion status etc. in the new GDDL Search menu
+
+![Example of the new search menu](resources/search.png)
+
 Adds a button on your profile that shows how many demons of each tier you've beaten
 
 ![Another example visible only to those who downloaded this mod](resources/split.png)
 
-You can also search for completed/uncompleted/both levels in the search menu, the button that opens it is located on the search screen on the right side.
-
 ## Known issues
 
 - <cy>Usernames</c> sometimes turn into <cy>`-`</c> after a <cr>failed</c> request, this is just cosmetic though (
   [apparently Rob's fault](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913375319))
 - Opening the *GDDL Demon Split* popup <co>might</c> cause a lag, don't worry about that :)
 - Going back from the *GDDL Search* popup goes back to the creator layer instead of the search layer
+- The level browser might display a button which should allow you to go to the next page of results even though there might be no more pages
 
 If you encounter any other issues, contact me on Discord (<cb>@b1rtek</c>) or on Github
 
 ## Special thanks
 
 <cb>*Code contributions:*</c> <cy>**[Diversion](https://github.com/B1rtek/Geode-GDDLIntegration/pull/3)**</c>  
-<cg>*Feature suggestions:*</c> <cy>[MasterGamerY](https://github.com/B1rtek/Geode-GDDLIntegration/issues/1), [Weebifying](https://github.com/B1rtek/Geode-GDDLIntegration/pull/2), [averiee_](https://github.com/B1rtek/Geode-GDDLIntegration/milestone/4), [TheSuperJepphyKiller](https://github.com/B1rtek/Geode-GDDLIntegration/issues/6), [hoshinekosanti](https://github.com/B1rtek/Geode-GDDLIntegration/issues/11)</c>  
-<cr>*Bug reporters:*</c> <cy>croozington, bllue, [Fleeym](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780380), [matcool](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780699), [Lexicon](https://github.com/B1rtek/Geode-GDDLIntegration/issues/7)</c>
-
-
-
+<cg>*Feature suggestions:*</c> <cy>[MasterGamerY](https://github.com/B1rtek/Geode-GDDLIntegration/issues/1), [Weebifying](https://github.com/B1rtek/Geode-GDDLIntegration/pull/2), [averiee_](https://github.com/B1rtek/Geode-GDDLIntegration/milestone/4), [TheSuperJepphyKiller](https://github.com/B1rtek/Geode-GDDLIntegration/issues/6), [hoshinekosanti](https://github.com/B1rtek/Geode-GDDLIntegration/issues/11),  [epicmushroom.](https://github.com/B1rtek/Geode-GDDLIntegration/issues/15)</c>  
+<cr>*Bug reporters:*</c> <cy>croozington, bllue, [Fleeym](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780380), [matcool](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780699), [Lexicon](https://github.com/B1rtek/Geode-GDDLIntegration/issues/7), [patrick61804](https://github.com/B1rtek/Geode-GDDLIntegration/issues/16)</c>

about.md

@@ -8,25 +8,26 @@ Click on the rating button (the red square) to see information about enjoyment a
 If the rating doesn't load, <cb>refresh</c> the level page (It happens sometimes if you have the level saved already).  
 The button can be moved to the level name (there's a setting for that)
 
+You can search for levels based on their tier or enjoyment rating, completion status etc. in the new GDDL Search menu
+
+![Example of the new search menu](b1rtek.gddlintegration/search.png)
+
 Adds a button on your profile that shows how many demons of each tier you've beaten
 
 ![Another example visible only to those who downloaded this mod](b1rtek.gddlintegration/split.png)
 
-You can also search for completed/uncompleted/both levels in the search menu, the button that opens it is located on the search screen on the right side.
-
 ## Known issues
 
 - <cy>Usernames</c> sometimes turn into <cy>`-`</c> after a <cr>failed</c> request, this is just cosmetic though (
   [apparently Rob's fault](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913375319))
 - Opening the *GDDL Demon Split* popup <co>might</c> cause a lag, don't worry about that :)
 - Going back from the *GDDL Search* popup goes back to the creator layer instead of the search layer
+- The level browser might display a button which should allow you to go to the next page of results even though there might be no more pages
 
 If you encounter any other issues, contact me on Discord (<cb>@b1rtek</c>) or on Github
 
 ## Special thanks
 
 <cb>*Code contributions:*</c> <cy>**[Diversion](https://github.com/B1rtek/Geode-GDDLIntegration/pull/3)**</c>  
-<cg>*Feature suggestions:*</c> <cy>[MasterGamerY](https://github.com/B1rtek/Geode-GDDLIntegration/issues/1), [Weebifying](https://github.com/B1rtek/Geode-GDDLIntegration/pull/2), [averiee_](https://github.com/B1rtek/Geode-GDDLIntegration/milestone/4), [TheSuperJepphyKiller](https://github.com/B1rtek/Geode-GDDLIntegration/issues/6), [hoshinekosanti](https://github.com/B1rtek/Geode-GDDLIntegration/issues/11)</c>  
-<cr>*Bug reporters:*</c> <cy>croozington, bllue, [Fleeym](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780380), [matcool](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780699), [Lexicon](https://github.com/B1rtek/Geode-GDDLIntegration/issues/7)</c>
-
-
+<cg>*Feature suggestions:*</c> <cy>[MasterGamerY](https://github.com/B1rtek/Geode-GDDLIntegration/issues/1), [Weebifying](https://github.com/B1rtek/Geode-GDDLIntegration/pull/2), [averiee_](https://github.com/B1rtek/Geode-GDDLIntegration/milestone/4), [TheSuperJepphyKiller](https://github.com/B1rtek/Geode-GDDLIntegration/issues/6), [hoshinekosanti](https://github.com/B1rtek/Geode-GDDLIntegration/issues/11),  [epicmushroom.](https://github.com/B1rtek/Geode-GDDLIntegration/issues/15)</c>  
+<cr>*Bug reporters:*</c> <cy>croozington, bllue, [Fleeym](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780380), [matcool](https://github.com/geode-sdk/indexer/issues/557#issuecomment-1913780699), [Lexicon](https://github.com/B1rtek/Geode-GDDLIntegration/issues/7), [patrick61804](https://github.com/B1rtek/Geode-GDDLIntegration/issues/16)</c>

changelog.md

@@ -1,3 +1,9 @@
+# v1.1.0
+- The search menu has been replaced by a much better one that allows the user to take full advantage of the GDDL API
+- Results in the GDDL Demon Split displayed in the level list after clicking a tier are now accurate according to the data in the GDDL API (that's why the numbers might not match, as the counts are generated using local cache)
+- The GDDL Search button can be now moved down (look in settings)
+- The GDDL Tier button on the level info page can be replaced again with a label, and it can be moved down (although it might overlap with the diamonds label in gauntlets and weeklies)
+
 # v1.0.5
 - Added an option to search for levels by tier
 - You can find that in the search menu, there's a GDDL button located on the right side

mod.json

@@ -1,7 +1,10 @@
 {
 	"geode": "2.0.0",
-	"version": "v1.0.5",
-	"gd": "2.204",
+	"version": "v1.1.0",
+	"gd": {
+		"android": "2.205",
+		"win": "2.204"
+	},
 	"id": "b1rtek.gddlintegration",
 	"name": "GDDL Integration",
 	"developer": "B1rtek",
@@ -22,6 +25,7 @@
 		"sprites": [
 			"resources/tier.png",
 			"resources/split.png",
+			"resources/search.png",
 			"resources/tiers/*.png"
 		]
 	},
@@ -42,6 +46,34 @@
 			"control": {
 				"slider": true
 			}
+		},
+		"move-gddl-search-button-down": {
+			"name": "Move GDDL Search button down",
+			"description": "Moves the GDDL Search button down a set number of spots, useful if you have Loquibot or other mods that also place buttons in the search menu which can result in buttons overlapping",
+			"type": "int",
+			"default": 0,
+			"min": 0,
+			"max": 3,
+			"control": {
+				"slider": true
+			}
+		},
+		"legacy-gddl-tier-label": {
+			"name": "Old GDDL Tier label",
+			"description": "Changes the tier button on the level info page into a clickable label, just like it used to be in the early versions of this mod",
+			"type": "bool",
+			"default": false
+		},
+		"legacy-gddl-tier-offset": {
+			"name": "Old GDDL Tier label offset",
+			"description": "Moves the old tier label down by the specified number of lines, useful if it collides with other objects placed in the same area, -1 puts it above the demon face",
+			"type": "int",
+			"default": 0,
+			"min": -1,
+			"max": 3,
+			"control": {
+				"slider": true
+			}
 		}
 	}
 }

src/GDDLDemonSplitLayer.cpp

@@ -1,7 +1,9 @@
 #include "GDDLDemonSplitLayer.h"
 
+#include <Geode/Geode.hpp>
 
 #include "RatingsManager.h"
+#include "GDDLSearchLayer.h"
 
 bool GDDLDemonSplitLayer::init() {
     if(!FLAlertLayer::init(75)) return false; // that magic number is actualy bg opacity btw
@@ -87,9 +89,8 @@ void GDDLDemonSplitLayer::onTierSearch(cocos2d::CCObject *sender) {
     auto *senderNode = dynamic_cast<CCNode *>(sender);
     const std::string tierStr = senderNode->getID();
     const int tierNumber = std::stoi(tierStr.substr(12, tierStr.size()-10));
-    RatingsManager::setupSearch(tierNumber, COMPLETED);
-    const auto listLayer = LevelBrowserLayer::create(RatingsManager::getSearchPage(1));
-    cocos::switchToScene(listLayer);
+    GDDLSearchLayer::requestSearchFromDemonSplit(tierNumber);
+    // the list should display itself hopefully
 }
 
 CCNode *GDDLDemonSplitLayer::createTierNode(int tier) {