rework sth

Author: TexBlock

build.gradle

@@ -33,6 +33,9 @@ subprojects {
     dependencies {
         minecraft "net.minecraft:minecraft:$rootProject.minecraft_version"
         mappings loom.officialMojangMappings()
+
+        implementation("com.google.auto.service:auto-service-annotations:1.1.1")
+        annotationProcessor("com.google.auto.service:auto-service:1.1.1")
     }
 
     java {

common/src/main/java/org/thinkingstudio/initialization/ModPlatform.java

@@ -0,0 +1,10 @@
+package org.thinkingstudio.initialization;
+
+import org.thinkingstudio.initialization.utils.ModEnv;
+import org.thinkingstudio.initialization.utils.ServiceHelper;
+
+public interface ModPlatform {
+    ModPlatform INSTANCE = ServiceHelper.loadService(ModPlatform.class);
+
+    ModEnv getEnvironment();
+}

common/src/main/java/org/thinkingstudio/initialization/utils/ModEnv.java

@@ -0,0 +1,16 @@
+package org.thinkingstudio.initialization.utils;
+
+import net.fabricmc.api.EnvType;
+
+public enum ModEnv {
+    CLIENT,
+    SERVER;
+
+    public static ModEnv fromPlatform(Object type) {
+        return type == EnvType.CLIENT ? CLIENT : type == EnvType.SERVER ? SERVER : null;
+    }
+
+    public EnvType toPlatform() {
+        return this == CLIENT ? EnvType.CLIENT : EnvType.SERVER;
+    }
+}

common/src/main/java/org/thinkingstudio/initialization/utils/ModEnvExecutor.java

@@ -0,0 +1,39 @@
+package org.thinkingstudio.initialization.utils;
+
+import net.fabricmc.api.EnvType;
+import org.thinkingstudio.initialization.ModPlatform;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+
+public final class ModEnvExecutor {
+    public static void runInEnv(EnvType type, Supplier<Runnable> runnableSupplier) {
+        runInEnv(ModEnv.fromPlatform(type), runnableSupplier);
+    }
+
+    public static void runInEnv(ModEnv type, Supplier<Runnable> runnableSupplier) {
+        if (ModPlatform.INSTANCE.getEnvironment() == type) {
+            runnableSupplier.get().run();
+        }
+    }
+
+    public static <T> Optional<T> getInEnv(EnvType type, Supplier<Supplier<T>> runnableSupplier) {
+        return getInEnv(ModEnv.fromPlatform(type), runnableSupplier);
+    }
+
+    public static <T> Optional<T> getInEnv(ModEnv type, Supplier<Supplier<T>> runnableSupplier) {
+        if (ModPlatform.INSTANCE.getEnvironment() == type) {
+            return Optional.ofNullable(runnableSupplier.get().get());
+        }
+
+        return Optional.empty();
+    }
+
+    public static <T> T getEnvSpecific(Supplier<Supplier<T>> client, Supplier<Supplier<T>> server) {
+        if (ModPlatform.INSTANCE.getEnvironment() == ModEnv.CLIENT) {
+            return client.get().get();
+        } else {
+            return server.get().get();
+        }
+    }
+}

common/src/main/java/org/thinkingstudio/initialization/utils/ServiceHelper.java

@@ -0,0 +1,9 @@
+package org.thinkingstudio.initialization.utils;
+
+import java.util.ServiceLoader;
+
+public class ServiceHelper {
+    public static <T> T loadService(final Class<T> clazz) {
+        return ServiceLoader.load(clazz).findFirst().orElseThrow(() -> new AssertionError("No impl found for " + clazz.getPackageName()));
+    }
+}

fabric/src/main/java/org/thinkingstudio/initialization/fabric/InitializationFabric.java

@@ -5,17 +5,20 @@
 import org.thinkingstudio.initialization.api.ClientModInitializer;
 import org.thinkingstudio.initialization.api.DedicatedServerModInitializer;
 import org.thinkingstudio.initialization.api.ModInitializer;
+import org.thinkingstudio.initialization.utils.ModEnv;
+import org.thinkingstudio.initialization.utils.ModEnvExecutor;
 
-public class InitializationFabric {
+public class InitializationFabric implements net.fabricmc.api.ModInitializer {
+
+    @Override
     public void onInitialize() {
         EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, ModInitializer.class).forEach(ModInitializer::onInitialize);
-    }
-
-    public void onInitializeClient() {
-        EntryPointManager.getEntryPoints(EntrypointContexts.CLIENT_INITIALIZER_KEY, ClientModInitializer.class).forEach(ClientModInitializer::onInitializeClient);
-    }
 
-    public void onInitializeServer() {
-        EntryPointManager.getEntryPoints(EntrypointContexts.SERVER_INITIALIZER_KEY, DedicatedServerModInitializer.class).forEach(DedicatedServerModInitializer::onInitializeServer);
+        ModEnvExecutor.runInEnv(ModEnv.CLIENT, () -> () -> {
+            EntryPointManager.getEntryPoints(EntrypointContexts.CLIENT_INITIALIZER_KEY, ClientModInitializer.class).forEach(ClientModInitializer::onInitializeClient);
+        });
+        ModEnvExecutor.runInEnv(ModEnv.SERVER, () -> () -> {
+            EntryPointManager.getEntryPoints(EntrypointContexts.SERVER_INITIALIZER_KEY, DedicatedServerModInitializer.class).forEach(DedicatedServerModInitializer::onInitializeServer);
+        });
     }
 }

fabric/src/main/java/org/thinkingstudio/initialization/fabric/ModPlatformImpl.java

@@ -0,0 +1,14 @@
+package org.thinkingstudio.initialization.fabric;
+
+import com.google.auto.service.AutoService;
+import net.fabricmc.loader.api.FabricLoader;
+import org.thinkingstudio.initialization.ModPlatform;
+import org.thinkingstudio.initialization.utils.ModEnv;
+
+@AutoService(ModPlatform.class)
+public class ModPlatformImpl implements ModPlatform {
+    @Override
+    public ModEnv getEnvironment() {
+        return ModEnv.fromPlatform(FabricLoader.getInstance().getEnvironmentType());
+    }
+}

fabric/src/main/resources/fabric.mod.json

@@ -15,13 +15,7 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "org.thinkingstudio.initialization.fabric.InitializationFabric::onInitialize"
-    ],
-    "client": [
-      "org.thinkingstudio.initialization.fabric.InitializationFabric::onInitializeClient"
-    ],
-    "server": [
-      "org.thinkingstudio.initialization.fabric.InitializationFabric::onInitializeServer"
+      "org.thinkingstudio.initialization.fabric.InitializationFabric"
     ]
   },
   "depends": {

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 # Mod properties
-mod_version=0.1.0
+mod_version=0.1.1
 maven_group=org.thinkingstudio
 archives_name=initialization
 enabled_platforms=fabric,neoforge

neoforge/src/main/java/org/thinkingstudio/initialization/neoforge/InitializationNeoForge.java

@@ -1,22 +1,34 @@
 package org.thinkingstudio.initialization.neoforge;
 
 import com.iafenvoy.integration.entrypoint.EntryPointManager;
-import net.neoforged.fml.loading.FMLLoader;
+import net.neoforged.bus.api.IEventBus;
+import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
+import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
 import org.thinkingstudio.initialization.Initialization;
 import net.neoforged.fml.common.Mod;
 import org.thinkingstudio.initialization.api.ClientModInitializer;
 import org.thinkingstudio.initialization.api.DedicatedServerModInitializer;
 import org.thinkingstudio.initialization.EntrypointContexts;
 import org.thinkingstudio.initialization.api.ModInitializer;
+import org.thinkingstudio.initialization.utils.ModEnv;
+import org.thinkingstudio.initialization.utils.ModEnvExecutor;
 
 @Mod(Initialization.MOD_ID)
 public final class InitializationNeoForge {
-    public InitializationNeoForge() {
-        EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, ModInitializer.class).forEach(ModInitializer::onInitialize);
-        if (FMLLoader.getDist().isClient()) {
-            EntryPointManager.getEntryPoints(EntrypointContexts.CLIENT_INITIALIZER_KEY, ClientModInitializer.class).forEach(ClientModInitializer::onInitializeClient);
-        } else if (FMLLoader.getDist().isDedicatedServer()) {
-            EntryPointManager.getEntryPoints(EntrypointContexts.SERVER_INITIALIZER_KEY, DedicatedServerModInitializer.class).forEach(DedicatedServerModInitializer::onInitializeServer);
-        }
+    public InitializationNeoForge(IEventBus modEventBus) {
+        EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, ModInitializer.class).forEach(modInitializer -> {
+            modEventBus.addListener(FMLCommonSetupEvent.class, event -> event.enqueueWork(modInitializer::onInitialize));
+        });
+        ModEnvExecutor.runInEnv(ModEnv.CLIENT, () -> () -> {
+            EntryPointManager.getEntryPoints(EntrypointContexts.CLIENT_INITIALIZER_KEY, ClientModInitializer.class).forEach(clientModInitializer -> {
+                modEventBus.addListener(FMLClientSetupEvent.class, event -> event.enqueueWork(clientModInitializer::onInitializeClient));
+            });
+        });
+        ModEnvExecutor.runInEnv(ModEnv.SERVER, () -> () -> {
+            EntryPointManager.getEntryPoints(EntrypointContexts.SERVER_INITIALIZER_KEY, DedicatedServerModInitializer.class).forEach(dedicatedServerModInitializer -> {
+                modEventBus.addListener(FMLDedicatedServerSetupEvent.class, event -> event.enqueueWork(dedicatedServerModInitializer::onInitializeServer));
+            });
+        });
     }
 }