🐛 Fix project mods applying / reverting incorrectly

Author: SnaveSutit

src/mods/eventHooks.ts

@@ -48,14 +48,16 @@ registerPropertyOverrideMod({
 })
 
 registerPropertyOverrideMod({
-	id: `animated-java:event-hook/pre-select-project-event`,
+	id: `animated-java:event-hook/pre-post-select-project-event`,
 	object: ModelProject.prototype,
-	key: 'select',
+	key: 'loadEditorState',
 
 	get: original => {
 		return function (this: ModelProject) {
 			EVENTS.PRE_SELECT_PROJECT.publish(this)
-			return original.call(this)
+			const result = original.call(this)
+			EVENTS.POST_SELECT_PROJECT.publish(this)
+			return result
 		}
 	},
 })

src/util/events.ts

@@ -26,6 +26,7 @@ const EVENTS = {
 	BLOCKSTATE_REGISTRY_LOADED: subscribable<void>(),
 
 	PRE_SELECT_PROJECT: subscribable<ModelProject>(),
+	POST_SELECT_PROJECT: subscribable<ModelProject>(),
 	SELECT_PROJECT: subscribable<ModelProject>(),
 	UNSELECT_PROJECT: subscribable<ModelProject>(),
 	CLOSE_PROJECT: subscribable<ModelProject>(),

src/util/moddingTools.ts

@@ -192,26 +192,27 @@ interface RegisterProjectModOptions<ID extends string, RevertContext extends any
 export function registerProjectMod<ID extends string, RevertContext extends any | void>(
 	options: RegisterProjectModOptions<ID, RevertContext>
 ) {
-	let revertContext: RevertContext | undefined
+	let revertContext: RevertContext | null = null
 
 	return registerMod({
 		...options,
 
 		apply: () => {
 			return [
 				EVENTS.PRE_SELECT_PROJECT.subscribe(project => {
+					// Effectively using revertContext as a boolean to check if the mod is applied
+					if (revertContext !== null) return
 					if (!options.condition(project)) return
 					console.log(`Applying project mod '${options.id}'`)
 					revertContext = options.apply()
 				}),
 
 				EVENTS.UNSELECT_PROJECT.subscribe(() => {
 					// Effectively using revertContext as a boolean to check if the mod is applied
-					if (revertContext !== undefined) {
-						console.log(`Reverting project mod '${options.id}'`)
-						options.revert(revertContext)
-						revertContext = undefined
-					}
+					if (revertContext === null) return
+					console.log(`Reverting project mod '${options.id}'`)
+					options.revert(revertContext)
+					revertContext = null
 				}),
 			]
 		},