Fix node

Author: Alphalaneous

README.md

@@ -7,7 +7,7 @@ Miscellaneous Geode utils to make development easier:
 Familiar modify syntax as Geode, supporting fields. `class $objectModify(SomeObject)` or `class $nodeModify(SomeNode)`
 You can name the modified node/object the same way as well `class $objectModify(MySomeObject, SomeObject)` or `class $nodeModify(MySomeNode, SomeNode)`
 
-$nodeModify and $objectModify do the same thing, but both names are available for organization purposes.
+$nodeModify and $objectModify do the same thing, except $nodeModify is a base of CCNode while $objectModify is a base of CCObject
 
 To use this, you will create a `void modify()` method within that class and inside of there you can change the node to your hearts content. You can use the fields struct just like in Geode to add fields if needed. 
 

about.md

@@ -7,7 +7,7 @@ Miscellaneous Geode utils to make development easier:
 Familiar modify syntax as Geode, supporting fields. `class $objectModify(SomeObject)` or `class $nodeModify(SomeNode)`
 You can name the modified node/object the same way as well `class $objectModify(MySomeObject, SomeObject)` or `class $nodeModify(MySomeNode, SomeNode)`
 
-$nodeModify and $objectModify do the same thing, but both names are available for organization purposes.
+$nodeModify and $objectModify do the same thing, except $nodeModify is a base of CCNode while $objectModify is a base of CCObject
 
 To use this, you will create a `void modify()` method within that class and inside of there you can change the node to your hearts content. You can use the fields struct just like in Geode to add fields if needed. 
 

changelog.md

@@ -1,3 +1,8 @@
+# 1.1.1
+- Separate Node and Object modify macros
+    - $nodeModify now has a base class of CCNode
+    - $objectModify has a base class of CCObject
+
 # 1.1.0
 - Fields and User Objects can now be used with CCObjects in the same way as CCNodes
 

include/NodeModding.h

@@ -96,10 +96,23 @@ class GEODE_CONCAT(GEODE_CONCAT(derived, Hook), __LINE__) : AlphaUtils::ObjectWr
 };\
 struct derived : AlphaUtils::ObjectWrapper<derived>
 
+#define ALPHA_NODE_MODIFY_DECLARE(base, derived) \
+GEODE_CONCAT(GEODE_CONCAT(derived, __LINE__), Dummy);\
+struct derived;\
+class GEODE_CONCAT(GEODE_CONCAT(derived, Hook), __LINE__) : AlphaUtils::NodeWrapper<derived> {\
+    private:\
+    static inline AlphaUtils::ModifyObjectLoad<derived> s_apply{#base};\
+};\
+struct derived : AlphaUtils::NodeWrapper<derived>
+
 #define MODIFY1(base) ALPHA_MODIFY_DECLARE(base, GEODE_CONCAT(hook, __LINE__))
 #define MODIFY2(derived, base) ALPHA_MODIFY_DECLARE(base, derived)
 
+#define MODIFYNODE1(base) ALPHA_NODE_MODIFY_DECLARE(base, GEODE_CONCAT(hook, __LINE__))
+#define MODIFYNODE2(derived, base) ALPHA_NODE_MODIFY_DECLARE(base, derived)
+
 #define $nodeModify(...) \
-    GEODE_INVOKE(GEODE_CONCAT(MODIFY, GEODE_NUMBER_OF_ARGS(__VA_ARGS__)), __VA_ARGS__)
+    GEODE_INVOKE(GEODE_CONCAT(MODIFYNODE, GEODE_NUMBER_OF_ARGS(__VA_ARGS__)), __VA_ARGS__)
 
-#define $objectModify(...) $nodeModify(__VA_ARGS__)
+#define $objectModify(...) \
+    GEODE_INVOKE(GEODE_CONCAT(MODIFY, GEODE_NUMBER_OF_ARGS(__VA_ARGS__)), __VA_ARGS__)

mod.json

@@ -8,7 +8,7 @@
 	},
 	"id": "alphalaneous.alphas_geode_utils",
 	"name": "Alpha's Geode Utils",
-	"version": "v1.1.0",
+	"version": "v1.1.1",
 	"developer": "Alphalaneous",
 	"description": "Miscellaneous utilities for Geode Modding",
 	"api": {