dumbass openfl

Project.xml

@@ -144,7 +144,6 @@
 	<haxedef name="SHOW_BUILD_ON_FPS" if="SHOW_BUILD_ON_FPS" />
 	<haxedef name="SOFTCODED_CLASSES" if="SOFTCODED_CLASSES" />
 	
-	<haxeflag name="--macro" value="funkin.macros.SoftcodedClassMacro.init()" />
 	<haxeflag name="--macro" value="funkin.macros.StdDeprecationsRemover.init()" />
 	<!-- _______________________________ Libraries ______________________________ -->
 
@@ -173,6 +172,7 @@
 	</section>
 	<haxeflag name="--macro" value="exclude('funkin.updating')" unless="UPDATE_CHECKING"/>
 	<haxeflag name="--macro" value="exclude('funkin.multitasking')" unless="ALLOW_MULTITASKING"/>
+	<haxeflag name="--macro" value="funkin.macros.SoftcodedClassMacro.init()" />
 
 	<haxedef name="HXCPP_CHECK_POINTER" if="release" />
 	<haxedef name="HXCPP_STACK_LINE" if="release" />

source/funkin/editors/charter/Charter.hx

@@ -492,7 +492,6 @@ class Charter extends UIState {
 
 	var __crochet:Float;
 	public override function update(elapsed:Float) {
-		// TODO: do optimization like NoteGroup
 		updateNoteLogic(elapsed);
 
 		super.update(elapsed);

source/funkin/game/PlayState.hx

@@ -1151,7 +1151,7 @@ class PlayState extends MusicBeatState
 				if (event.params.length > 0 && event.params[0] is Int)
 					curCameraTarget = event.params[0];
 			case BPM_CHANGE:
-				// todo!!
+				// automatically handled by conductor
 			case ALT_ANIM_TOGGLE:
 				// todo!!!
 			default:

source/funkin/macros/EventMacro.hx

@@ -15,6 +15,10 @@ class EventMacro {
 		var curClass = curClassRest.get();
 		if (curClass == null || curClass.name == "CancellableEvent") return fields;
 
+		for(f in fields)
+			if (f.name == "recycle")
+				return fields;
+
 
 		// gets all fields
 		var values:Array<EventVar> = [];

source/funkin/macros/SoftcodedClassMacro.hx

@@ -4,7 +4,6 @@ using StringTools;
 class SoftcodedClassMacro {
 	#if macro
 	public static function init() {
-		trace("cock and balls");
 		Compiler.addGlobalMetadata('funkin', '@:build(funkin.macros.SoftcodedClassMacro.build())');
 		Compiler.addGlobalMetadata('flixel', '@:build(funkin.macros.SoftcodedClassMacro.build())');
 	}
@@ -27,8 +26,7 @@ class SoftcodedClassMacro {
 				kind: FVar(scriptClassType, macro null)
 			});
 			var c = cl.get();
-			trace(c.name);
-			if (c.name.endsWith('__Softcoded')) return fields;
+			if (c.name.endsWith('__Softcoded') || c.name.endsWith("_HSC") || c.name.endsWith("_Impl_")) return fields;
 			if (c.params.length > 0) return fields; // NOT SUPPORTED
 			if (c.isAbstract) return fields;
 
@@ -47,12 +45,15 @@ class SoftcodedClassMacro {
 
 			shadowClass.name = '${c.name}__Softcoded';
 			shadowClass.fields = funcs;
-			shadowClass.pack = c.pack; // todo
+			shadowClass.pack = c.pack;
 			shadowClass.kind = TDClass({
 				pack: c.pack,
 				name: c.name
 			}, [], false, false, false);
 
+			var addedFields:Array<String> = [];
+
+			#if !display
 			for(f in [for(f in fields) f]) {
 				var valid = true;
 				if (f.access != null) for(e in f.access) {
@@ -197,7 +198,9 @@ class SoftcodedClassMacro {
 
 				}
 			}
+			#end
 
+			
 			var imports = [for(i in Context.getLocalImports()) i];
 			imports.push({
 				path: [for(p in c.module.split(".")) {

source/funkin/scripting/Script.hx

@@ -338,7 +338,7 @@ class ScriptCustomClass implements IHScriptCustomConstructor {
 		this.scrClass = scrClass;
 		this.scrType = scrType;
 	}
-	public function hnew(...args:Dynamic):Dynamic {
+	public function hnew(args:Array<Dynamic>):Dynamic {
 		var a = [for(arg in args) arg];
 		a.insert(0, scrClass);
 		return Type.createInstance(scrType, a);