Ability to move F block

Author: Alphalaneous

mod.json

@@ -8,7 +8,7 @@
 	},
 	"id": "alphalaneous.awesome_modifier_icons",
 	"name": "Awesome Modifier Icons",
-	"version": "v1.0.2",
+	"version": "v1.0.3",
 	"developer": "Alphalaneous",
 	"description": "Makes D, J, S, H, and F blocks have icons instead of a letter!",
 	"resources": {
@@ -33,6 +33,12 @@
 			"description": "Show the letters instead of hiding them",
 			"type": "bool",
 			"default": false
+		},
+		"move-f-block": {
+			"name": "Move F block",
+			"description": "Moves the F block to be next to the other modifier blocks rather than separated by the force blocks.",
+			"type": "bool",
+			"default": true
 		}
 	}
 }

src/main.cpp

@@ -1,5 +1,6 @@
 #include <Geode/Geode.hpp>
 #include <Geode/modify/EffectGameObject.hpp>
+#include <Geode/modify/EditButtonBar.hpp>
 
 using namespace geode::prelude;
 
@@ -73,4 +74,35 @@ class $modify(MyEffectGameObject, EffectGameObject) {
 			}
 		}
 	}
+};
+
+class $modify(MyEditButtonBar, EditButtonBar) {
+    
+    void loadFromItems(CCArray* items, int c, int r, bool unkBool) {
+
+		if (Mod::get()->getSettingValue<bool>("move-f-block")) {
+			int idx = 0;
+			int hIndex = 0;
+
+			for (CCNode* item : CCArrayExt<CCNode*>(items)) {
+				if(ButtonSprite* bspr = getChildOfType<ButtonSprite>(item, 0)){
+					if(EffectGameObject* ego = getChildOfType<EffectGameObject>(bspr, 0)){
+						if(CCLabelBMFont* label = getChildOfType<CCLabelBMFont>(ego, 0)){
+							std::string text = std::string(label->getString());
+							if(text == "H"){
+								hIndex = idx;
+							}
+							if(text == "F"){
+								items->removeObject(item, false);
+								items->insertObject(item, hIndex + 1);
+							}
+						}
+					}
+				}
+				idx++;
+			}
+		}
+
+        EditButtonBar::loadFromItems(items, c, r, unkBool);
+    }
 };