Skip to content

Commit eedfb5a

Browse files
committed
final refactor
1 parent 1fa2230 commit eedfb5a

25 files changed

+180
-48
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ This will compile the mod and generate the necessary files.
3535
To add a custom background layer to a **Geometry Dash** menu, follow the example below. This demonstrates how to add a background layer in `CreatorLayer`.
3636

3737
```cpp
38-
#include "../SwelvyBG.hpp"
38+
#include "../../SwelvyBG.hpp"
3939
#include <Geode/Geode.hpp>
4040
#include <Geode/modify/CreatorLayer.hpp>
4141

mod.json

Lines changed: 156 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -82,127 +82,127 @@
8282
"name": "Geometry Dash"
8383
},
8484
"gd/MenuLayer": {
85-
"name": "Show in main menu",
85+
"name": "Main menu",
8686
"description": "MenuLayer",
8787
"type": "bool",
8888
"default": true
8989
},
9090
"gd/PlayLayer": {
91-
"name": "Show in gameplay",
91+
"name": "Gameplay",
9292
"description": "PlayLayer",
9393
"type": "bool",
9494
"default": false
9595
},
9696
"gd/LoadingLayer": {
97-
"name": "Show in loading screen",
97+
"name": "Loading screen",
9898
"description": "LoadingLayer",
9999
"type": "bool",
100100
"default": true
101101
},
102102
"gd/LevelSelectLayer": {
103-
"name": "Show in level select menu",
103+
"name": "Level select menu",
104104
"description": "LevelSelectLayer",
105105
"type": "bool",
106106
"default": true
107107
},
108108
"gd/CreatorLayer": {
109-
"name": "Show in creator menu",
109+
"name": "Creator menu",
110110
"description": "CreatorLayer",
111111
"type": "bool",
112112
"default": true
113113
},
114114
"gd/LevelBrowserLayer": {
115-
"name": "Show in level lists",
115+
"name": "Level lists",
116116
"description": "LevelBrowserLayer",
117117
"type": "bool",
118118
"default": true
119119
},
120120
"gd/EditLevelLayer": {
121-
"name": "Show in edit level menu",
121+
"name": "Edit level menu",
122122
"description": "EditLevelLayer",
123123
"type": "bool",
124124
"default": true
125125
},
126126
"gd/LevelInfoLayer": {
127-
"name": "Show in play level menu",
127+
"name": "Play level menu",
128128
"description": "LevelInfoLayer",
129129
"type": "bool",
130130
"default": true
131131
},
132132
"gd/GJGarageLayer": {
133-
"name": "Show in icon select menu",
133+
"name": "Icon select menu",
134134
"description": "GJGarageLayer",
135135
"type": "bool",
136136
"default": true
137137
},
138138
"gd/LevelSearchLayer": {
139-
"name": "Show in search filters menu",
139+
"name": "Search filters menu",
140140
"description": "LevelSearchLayer",
141141
"type": "bool",
142142
"default": true
143143
},
144144
"gd/LeaderboardsLayer": {
145-
"name": "Show in leaderboards menu",
145+
"name": "Leaderboards menu",
146146
"description": "LeaderboardsLayer",
147147
"type": "bool",
148148
"default": true
149149
},
150150
"gd/LevelListLayer": {
151-
"name": "Show in level list menu",
151+
"name": "Level list menu",
152152
"description": "LevelListLayer",
153153
"type": "bool",
154154
"default": true
155155
},
156156
"gd/GauntletSelectLayer": {
157-
"name": "Show in gauntlet select menu",
157+
"name": "Gauntlet select menu",
158158
"description": "GauntletSelectLayer",
159159
"type": "bool",
160160
"default": true
161161
},
162162
"gd/GauntletLayer": {
163-
"name": "Show in gauntlet map menu",
163+
"name": "Gauntlet map menu",
164164
"description": "GauntletLayer",
165165
"type": "bool",
166166
"default": true
167167
},
168168
"gd/SecretRewardsLayer": {
169-
"name": "Show in secret chests menu",
169+
"name": "Secret chests menu",
170170
"description": "SecretRewardsLayer",
171171
"type": "bool",
172172
"default": true
173173
},
174174
"gd/LevelAreaInnerLayer": {
175-
"name": "Show in tower levels menu",
175+
"name": "Tower levels menu",
176176
"description": "LevelAreaInnerLayer",
177177
"type": "bool",
178178
"default": true
179179
},
180180
"gd/LevelAreaLayer": {
181-
"name": "Show in tower menu",
181+
"name": "Tower menu",
182182
"description": "LevelAreaLayer",
183183
"type": "bool",
184184
"default": true
185185
},
186186
"gd/SecretLayer": {
187-
"name": "Show in Vault",
187+
"name": "Vault",
188188
"description": "SecretLayer",
189189
"type": "bool",
190190
"default": true
191191
},
192192
"gd/SecretLayer2": {
193-
"name": "Show in Vault of Secrets",
193+
"name": "Vault of Secrets",
194194
"description": "SecretLayer2",
195195
"type": "bool",
196196
"default": true
197197
},
198198
"gd/SecretLayer3": {
199-
"name": "Show in Basement",
199+
"name": "Basement",
200200
"description": "SecretLayer3",
201201
"type": "bool",
202202
"default": true
203203
},
204204
"gd/SecretLayer4": {
205-
"name": "Show in Chamber of Time",
205+
"name": "Chamber of Time",
206206
"description": "SecretLayer4",
207207
"type": "bool",
208208
"default": true
@@ -211,9 +211,141 @@
211211
"type": "title",
212212
"name": "Mods Settings"
213213
},
214-
"external-mods": {
215-
"name": "external mods",
216-
"description": "For external mod layers",
214+
"cvolton.betterinfo/CustomCreatorLayer": {
215+
"name": "CustomCreatorLayer",
216+
"description": "CustomCreatorLayer",
217+
"type": "bool",
218+
"default": true
219+
},
220+
"cvolton.betterinfo/DailyViewLayer": {
221+
"name": "DailyViewLayer",
222+
"description": "DailyViewLayer",
223+
"type": "bool",
224+
"default": true
225+
},
226+
"cvolton.betterinfo/LevelSearchViewLayer": {
227+
"name": "LevelSearchViewLayer",
228+
"description": "LevelSearchViewLayer",
229+
"type": "bool",
230+
"default": true
231+
},
232+
"cvolton.betterinfo/RewardGroupLayer": {
233+
"name": "RewardGroupLayer",
234+
"description": "RewardGroupLayer",
235+
"type": "bool",
236+
"default": true
237+
},
238+
"cvolton.betterinfo/RewardViewLayer": {
239+
"name": "RewardViewLayer",
240+
"description": "RewardViewLayer",
241+
"type": "bool",
242+
"default": true
243+
},
244+
"dankmeme.globed2/GlobedLevelListLayer": {
245+
"name": "GlobedLevelListLayer",
246+
"description": "GlobedLevelListLayer",
247+
"type": "bool",
248+
"default": true
249+
},
250+
"dankmeme.globed2/GlobedMenuLayer": {
251+
"name": "GlobedMenuLayer",
252+
"description": "GlobedMenuLayer",
253+
"type": "bool",
254+
"default": true
255+
},
256+
"dankmeme.globed2/GlobedServersLayer": {
257+
"name": "GlobedServersLayer",
258+
"description": "GlobedServersLayer",
259+
"type": "bool",
260+
"default": true
261+
},
262+
"dankmeme.globed2/GlobedSettingsLayer": {
263+
"name": "GlobedSettingsLayer",
264+
"description": "GlobedSettingsLayer",
265+
"type": "bool",
266+
"default": true
267+
},
268+
"geode.loader/ModsLayer": {
269+
"name": "ModsLayer",
270+
"description": "ModsLayer",
271+
"type": "bool",
272+
"default": true
273+
},
274+
"geode.texture-loader/PackSelectLayer": {
275+
"name": "PackSelectLayer",
276+
"description": "PackSelectLayer",
277+
"type": "bool",
278+
"default": true
279+
},
280+
"hiimjustin000.integrated_demonlist/IDListLayer": {
281+
"name": "IDListLayer",
282+
"description": "IDListLayer",
283+
"type": "bool",
284+
"default": true
285+
},
286+
"hiimjustin000.integrated_demonlist/IDPackLayer": {
287+
"name": "IDPackLayer",
288+
"description": "IDPackLayer",
289+
"type": "bool",
290+
"default": true
291+
},
292+
"km7dev.gdps-switcher/ServerSwitchLayer": {
293+
"name": "ServerSwitchLayer",
294+
"description": "ServerSwitchLayer",
295+
"type": "bool",
296+
"default": true
297+
},
298+
"limegradient.betterachievements/BetterAchivementLayer": {
299+
"name": "BetterAchivementLayer",
300+
"description": "BetterAchivementLayer",
301+
"type": "bool",
302+
"default": true
303+
},
304+
"minemaker0430.gddp_integration/DPLayer": {
305+
"name": "DPLayer",
306+
"description": "DPLayer",
307+
"type": "bool",
308+
"default": true
309+
},
310+
"minemaker0430.gddp_integration/DPListLayer": {
311+
"name": "DPListLayer",
312+
"description": "DPListLayer",
313+
"type": "bool",
314+
"default": true
315+
},
316+
"omgrod.garage_plus/GPFeedbackLayer": {
317+
"name": "GPFeedbackLayer",
318+
"description": "GPFeedbackLayer",
319+
"type": "bool",
320+
"default": true
321+
},
322+
"omgrod.garage_plus/GPKofiLayer": {
323+
"name": "GPKofiLayer",
324+
"description": "GPKofiLayer",
325+
"type": "bool",
326+
"default": true
327+
},
328+
"omgrod.gdstream/StreamCreatorLayer": {
329+
"name": "StreamCreatorLayer",
330+
"description": "StreamCreatorLayer",
331+
"type": "bool",
332+
"default": true
333+
},
334+
"omgrod.gdstream/StreamLayer": {
335+
"name": "StreamLayer",
336+
"description": "StreamLayer",
337+
"type": "bool",
338+
"default": true
339+
},
340+
"thesillydoggo.newgrounds_explorer/NewgroundsBrowserLayer": {
341+
"name": "NewgroundsBrowserLayer",
342+
"description": "NewgroundsBrowserLayer",
343+
"type": "bool",
344+
"default": true
345+
},
346+
"uproxide.textures/TextureWorkshopLayer": {
347+
"name": "TextureWorkshopLayer",
348+
"description": "TextureWorkshopLayer",
217349
"type": "bool",
218350
"default": true
219351
},

src/layers/GYModSettingsPopup.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bool GYModSettingsPopup::setup(std::string const& modName, std::string const& mo
2626
scroll->setTouchEnabled(true);
2727

2828
for (auto& key : Mod::get()->getSettingKeys()) {
29-
if (key.starts_with("gd/")) {
29+
if (key.starts_with(fmt::format("{}/", modID))) {
3030
SettingNode* node;
3131
if (auto sett = Mod::get()->getSetting(key)) {
3232
node = sett->createNode(layerSize.width);

src/modify/gd/CreatorLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../SwelvyBG.hpp"
1+
#include "../../SwelvyBG.hpp"
22
#include <Geode/Geode.hpp>
33
#include <Geode/modify/CreatorLayer.hpp>
44

src/modify/gd/EditLevelLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../SwelvyBG.hpp"
1+
#include "../../SwelvyBG.hpp"
22
#include <Geode/Geode.hpp>
33
#include <Geode/modify/EditLevelLayer.hpp>
44

src/modify/gd/GJGarageLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../SwelvyBG.hpp"
1+
#include "../../SwelvyBG.hpp"
22
#include <Geode/Geode.hpp>
33
#include <Geode/modify/GJGarageLayer.hpp>
44

src/modify/gd/GauntletLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../SwelvyBG.hpp"
1+
#include "../../SwelvyBG.hpp"
22
#include <Geode/Geode.hpp>
33
#include <Geode/modify/GauntletLayer.hpp>
44

src/modify/gd/GauntletSelectLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../SwelvyBG.hpp"
1+
#include "../../SwelvyBG.hpp"
22
#include <Geode/Geode.hpp>
33
#include <Geode/modify/GauntletSelectLayer.hpp>
44

src/modify/gd/LeaderboardsLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../SwelvyBG.hpp"
1+
#include "../../SwelvyBG.hpp"
22
#include <Geode/Geode.hpp>
33
#include <Geode/modify/LeaderboardsLayer.hpp>
44

src/modify/gd/LevelAreaInnerLayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "../SwelvyBG.hpp"
1+
#include "../../SwelvyBG.hpp"
22
#include <Geode/Geode.hpp>
33
#include <Geode/modify/LevelAreaInnerLayer.hpp>
44

0 commit comments

Comments
 (0)