Added @ModuleInstance annotation. Annotate a static field inside your module class to have it populated with its instance, allowing for easy singleton patterns. This is opt in

Author: MehVahdJukaar

src/main/java/org/violetmoon/zeta/module/ModuleInstance.java

@@ -0,0 +1,13 @@
+package org.violetmoon.zeta.module;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+// populates a public static field in your module class with the module instance. Needs to be inside a @ZetaLoadModule class
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.FIELD)
+public @interface ModuleInstance {
+
+}

src/main/java/org/violetmoon/zeta/module/ZetaModuleManager.java

@@ -1,6 +1,8 @@
 package org.violetmoon.zeta.module;
 
 import java.lang.reflect.Constructor;
+import java.lang.reflect.Field;
+import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
@@ -154,12 +156,41 @@ private ZetaModule constructAndSetup(TentativeModule t) {
 		//category upkeep
 		modulesInCategory.computeIfAbsent(module.category, __ -> new ArrayList<>()).add(module);
 
+		populateModuleInstanceField(module);
+
 		//post-construction callback
 		module.postConstruct();
 
 		return module;
 	}
 
+	// feel free to refactor
+	private static void populateModuleInstanceField(ZetaModule module) {
+		try {
+			var clazz = module.getClass();
+			Field[] fields = clazz.getDeclaredFields();
+			Field targetField = null;
+
+			for (Field field : fields) {
+				if (field.isAnnotationPresent(ModuleInstance.class)) {
+					if (targetField != null) {
+						throw new IllegalStateException("Can't have more than one @ModuleInstance field per module class");
+					}
+					if (!Modifier.isStatic(field.getModifiers())) {
+						throw new IllegalStateException("@ModuleInstance annotated field must be static");
+					}
+					targetField = field;
+				}
+			}
+			if(targetField != null) {
+				targetField.setAccessible(true);
+				targetField.set(null, module);
+			}
+		}catch (Exception e){
+			throw new RuntimeException(e);
+		}
+	}
+
 	private <Z extends ZetaModule> Z construct(Class<Z> clazz) {
 		try {
 			Constructor<Z> cons = clazz.getConstructor();