add testmod, fix issue

TexBlock · TexBlock · commit aeddd694fa8e · 2025-08-19T00:29:51.000+08:00
diff --git a/fabric/src/main/java/org/thinkingstudio/initialization/fabric/InitializationFabric.java b/fabric/src/main/java/org/thinkingstudio/initialization/fabric/InitializationFabric.java
@@ -1,12 +1,21 @@
 package org.thinkingstudio.initialization.fabric;
 
 import com.iafenvoy.integration.entrypoint.EntryPointManager;
-import net.fabricmc.api.ModInitializer;
 import org.thinkingstudio.initialization.EntrypointContexts;
+import org.thinkingstudio.initialization.api.ClientModInitializer;
+import org.thinkingstudio.initialization.api.DedicatedServerModInitializer;
+import org.thinkingstudio.initialization.api.ModInitializer;
 
-public final class InitializationFabric implements ModInitializer {
-    @Override
+public class InitializationFabric {
     public void onInitialize() {
-        EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, org.thinkingstudio.initialization.api.ModInitializer.class);
+        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);
     }
 }
diff --git a/fabric/src/main/java/org/thinkingstudio/initialization/fabric/client/InitializationFabricClient.java b/fabric/src/main/java/org/thinkingstudio/initialization/fabric/client/InitializationFabricClient.java
diff --git a/fabric/src/main/java/org/thinkingstudio/initialization/fabric/server/InitializationFabricServer.java b/fabric/src/main/java/org/thinkingstudio/initialization/fabric/server/InitializationFabricServer.java
diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json
@@ -15,13 +15,13 @@
   "environment": "*",
   "entrypoints": {
     "main": [
-      "org.thinkingstudio.initialization.fabric.InitializationFabric"
+      "org.thinkingstudio.initialization.fabric.InitializationFabric::onInitialize"
     ],
     "client": [
-      "org.thinkingstudio.initialization.fabric.client.InitializationFabricClient"
+      "org.thinkingstudio.initialization.fabric.InitializationFabric::onInitializeClient"
     ],
     "server": [
-      "org.thinkingstudio.initialization.fabric.server.InitializationFabricServer"
+      "org.thinkingstudio.initialization.fabric.InitializationFabric::onInitializeServer"
     ]
   },
   "depends": {
diff --git a/neoforge/src/main/java/org/thinkingstudio/initialization/neoforge/InitializationNeoForge.java b/neoforge/src/main/java/org/thinkingstudio/initialization/neoforge/InitializationNeoForge.java
@@ -1,11 +1,8 @@
 package org.thinkingstudio.initialization.neoforge;
 
 import com.iafenvoy.integration.entrypoint.EntryPointManager;
-import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
-import net.neoforged.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.neoforged.fml.event.lifecycle.FMLDedicatedServerSetupEvent;
+import net.neoforged.bus.api.IEventBus;
 import net.neoforged.fml.loading.FMLLoader;
-import net.neoforged.neoforge.common.NeoForge;
 import org.thinkingstudio.initialization.Initialization;
 import net.neoforged.fml.common.Mod;
 import org.thinkingstudio.initialization.api.ClientModInitializer;
@@ -15,25 +12,18 @@
 
 @Mod(Initialization.MOD_ID)
 public final class InitializationNeoForge {
-    public InitializationNeoForge() {
-        NeoForge.EVENT_BUS.addListener(FMLCommonSetupEvent.class, event -> {
-            event.enqueueWork(() -> {
-                EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, ModInitializer.class);
-            });
-        });
-
+    public InitializationNeoForge(IEventBus modEventBus) {
+//        modEventBus.addListener(FMLCommonSetupEvent.class, event -> {
+//            event.enqueueWork(() -> {
+//                EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, ModInitializer.class);
+//            });
+//        });
         if (FMLLoader.getDist().isClient()) {
-            NeoForge.EVENT_BUS.addListener(FMLClientSetupEvent.class, event -> {
-                event.enqueueWork(() -> {
-                    EntryPointManager.getEntryPoints(EntrypointContexts.CLIENT_INITIALIZER_KEY, ClientModInitializer.class);
-                });
-            });
+            EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, ModInitializer.class).forEach(ModInitializer::onInitialize);
+            EntryPointManager.getEntryPoints(EntrypointContexts.CLIENT_INITIALIZER_KEY, ClientModInitializer.class).forEach(ClientModInitializer::onInitializeClient);
         } else if (FMLLoader.getDist().isDedicatedServer()) {
-            NeoForge.EVENT_BUS.addListener(FMLDedicatedServerSetupEvent.class, event -> {
-                event.enqueueWork(() -> {
-                    EntryPointManager.getEntryPoints(EntrypointContexts.SERVER_INITIALIZER_KEY, DedicatedServerModInitializer.class);
-                });
-            });
+            EntryPointManager.getEntryPoints(EntrypointContexts.MAIN_INITIALIZER_KEY, ModInitializer.class).forEach(ModInitializer::onInitialize);
+            EntryPointManager.getEntryPoints(EntrypointContexts.SERVER_INITIALIZER_KEY, DedicatedServerModInitializer.class).forEach(DedicatedServerModInitializer::onInitializeServer);
         }
     }
 }
diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -23,10 +23,6 @@ side = "BOTH"
 [[dependencies.initialization]]
 modId = "minecraft"
 type = "required"
-versionRange = "[1.21.1,)"
+versionRange = "[1.21,)"
 ordering = "NONE"
 side = "BOTH"
-
-
-[[mixins]]
-config = "initialization.mixins.json"
diff --git a/settings.gradle b/settings.gradle
@@ -12,3 +12,6 @@ rootProject.name = 'initialization'
 include 'common'
 include 'fabric'
 include 'neoforge'
+
+include 'testmod-neoforge'
+include 'testmod-fabric'
diff --git a/testmod-fabric/build.gradle b/testmod-fabric/build.gradle
@@ -0,0 +1,35 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+}
+
+architectury {
+    platformSetupLoomIde()
+    fabric()
+}
+
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentFabric.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+dependencies {
+    modImplementation "net.fabricmc:fabric-loader:$rootProject.fabric_loader_version"
+
+    modImplementation("com.iafenvoy.integration:integration-fabric:0.2")
+
+    implementation project(path: ":fabric", configuration: "namedElements")
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionFabric')
+}
diff --git a/testmod-fabric/src/main/java/org/thinkingstudio/initialization/test/fabric/TestModFabric.java b/testmod-fabric/src/main/java/org/thinkingstudio/initialization/test/fabric/TestModFabric.java
@@ -0,0 +1,17 @@
+package org.thinkingstudio.initialization.test.fabric;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.thinkingstudio.initialization.api.ModInitializer;
+
+public class TestModFabric implements ModInitializer {
+    public static final Logger LOGGER = LoggerFactory.getLogger("TestModFabric");
+    private static final Marker MARKER = MarkerFactory.getMarker("Main");
+
+    @Override
+    public void onInitialize() {
+        LOGGER.error(MARKER, "ModInitializer is working!");
+    }
+}
diff --git a/testmod-fabric/src/main/java/org/thinkingstudio/initialization/test/fabric/client/TestModFabricClient.java b/testmod-fabric/src/main/java/org/thinkingstudio/initialization/test/fabric/client/TestModFabricClient.java
@@ -0,0 +1,15 @@
+package org.thinkingstudio.initialization.test.fabric.client;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.thinkingstudio.initialization.api.ClientModInitializer;
+import org.thinkingstudio.initialization.test.fabric.TestModFabric;
+
+public class TestModFabricClient implements ClientModInitializer {
+    private static final Marker MARKER = MarkerFactory.getMarker("Client");
+
+    @Override
+    public void onInitializeClient() {
+        TestModFabric.LOGGER.error(MARKER, "Client ModInitializer is working!");
+    }
+}
diff --git a/testmod-fabric/src/main/java/org/thinkingstudio/initialization/test/fabric/server/TestModFabricServer.java b/testmod-fabric/src/main/java/org/thinkingstudio/initialization/test/fabric/server/TestModFabricServer.java
@@ -0,0 +1,15 @@
+package org.thinkingstudio.initialization.test.fabric.server;
+
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.thinkingstudio.initialization.api.DedicatedServerModInitializer;
+import org.thinkingstudio.initialization.test.fabric.TestModFabric;
+
+public class TestModFabricServer implements DedicatedServerModInitializer {
+    private static final Marker MARKER = MarkerFactory.getMarker("DedicatedServer");
+
+    @Override
+    public void onInitializeServer() {
+        TestModFabric.LOGGER.error(MARKER, "DedicatedServer ModInitializer is working!");
+    }
+}
diff --git a/testmod-fabric/src/main/resources/fabric.mod.json b/testmod-fabric/src/main/resources/fabric.mod.json
@@ -0,0 +1,32 @@
+{
+  "schemaVersion": 1,
+  "id": "initialization_test",
+  "version": "${version}",
+  "name": "Initialization Test Mod",
+  "description": "Common ModInitializer based on Integration.",
+  "authors": [
+    "TexTrue"
+  ],
+  "contact": {
+    "source": ""
+  },
+  "license": "LGPL-3.0",
+  "icon": "assets/initialization/icon.png",
+  "environment": "*",
+  "entrypoints": {
+    "main_init": [
+      "org.thinkingstudio.initialization.test.fabric.TestModFabric"
+    ],
+    "client_init": [
+      "org.thinkingstudio.initialization.test.fabric.client.TestModFabricClient"
+    ],
+    "server_init": [
+      "org.thinkingstudio.initialization.test.fabric.server.TestModFabricServer"
+    ]
+  },
+  "depends": {
+    "fabricloader": ">=0.17.2",
+    "minecraft": "~1.21.1",
+    "java": ">=21"
+  }
+}
diff --git a/testmod-neoforge/build.gradle b/testmod-neoforge/build.gradle
@@ -0,0 +1,42 @@
+plugins {
+    id 'com.github.johnrengelman.shadow'
+}
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+configurations {
+    common {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentNeoForge.extendsFrom common
+
+    // Files in this configuration will be bundled into your mod using the Shadow plugin.
+    // Don't use the `shadow` configuration from the plugin itself as it's meant for excluding files.
+    shadowBundle {
+        canBeResolved = true
+        canBeConsumed = false
+    }
+}
+
+repositories {
+    maven {
+        name = 'NeoForged'
+        url = 'https://maven.neoforged.net/releases'
+    }
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:$rootProject.neoforge_version"
+
+    modImplementation("com.iafenvoy.integration:integration-neoforge:0.2")
+
+    implementation project(path: ":neoforge", configuration: "namedElements")
+    common(project(path: ':common', configuration: 'namedElements')) { transitive false }
+    shadowBundle project(path: ':common', configuration: 'transformProductionNeoForge')
+}
diff --git a/testmod-neoforge/gradle.properties b/testmod-neoforge/gradle.properties
@@ -0,0 +1 @@
+loom.platform=neoforge
diff --git a/testmod-neoforge/src/main/java/org/thinkingstudio/initialization/test/neoforge/TestModNeoForge.java b/testmod-neoforge/src/main/java/org/thinkingstudio/initialization/test/neoforge/TestModNeoForge.java
@@ -0,0 +1,20 @@
+package org.thinkingstudio.initialization.test.neoforge;
+
+import com.iafenvoy.integration.entrypoint.EntryPointProvider;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.thinkingstudio.initialization.EntrypointContexts;
+import org.thinkingstudio.initialization.api.ModInitializer;
+
+@EntryPointProvider(slug = EntrypointContexts.MAIN_INITIALIZER_KEY)
+public class TestModNeoForge implements ModInitializer {
+    public static final Logger LOGGER = LoggerFactory.getLogger("TestModNeoForge");
+    private static final Marker MARKER = MarkerFactory.getMarker("Main");
+
+    @Override
+    public void onInitialize() {
+        LOGGER.error(MARKER, "ModInitializer is working!");
+    }
+}
diff --git a/testmod-neoforge/src/main/java/org/thinkingstudio/initialization/test/neoforge/client/TestModNeoForgeClient.java b/testmod-neoforge/src/main/java/org/thinkingstudio/initialization/test/neoforge/client/TestModNeoForgeClient.java
@@ -0,0 +1,18 @@
+package org.thinkingstudio.initialization.test.neoforge.client;
+
+import com.iafenvoy.integration.entrypoint.EntryPointProvider;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.thinkingstudio.initialization.EntrypointContexts;
+import org.thinkingstudio.initialization.api.ClientModInitializer;
+import org.thinkingstudio.initialization.test.neoforge.TestModNeoForge;
+
+@EntryPointProvider(slug = EntrypointContexts.CLIENT_INITIALIZER_KEY)
+public class TestModNeoForgeClient implements ClientModInitializer {
+    private static final Marker MARKER = MarkerFactory.getMarker("Client");
+
+    @Override
+    public void onInitializeClient() {
+        TestModNeoForge.LOGGER.error(MARKER, "Client ModInitializer is working!");
+    }
+}
diff --git a/testmod-neoforge/src/main/java/org/thinkingstudio/initialization/test/neoforge/server/TestModNeoForgeServer.java b/testmod-neoforge/src/main/java/org/thinkingstudio/initialization/test/neoforge/server/TestModNeoForgeServer.java
@@ -0,0 +1,18 @@
+package org.thinkingstudio.initialization.test.neoforge.server;
+
+import com.iafenvoy.integration.entrypoint.EntryPointProvider;
+import org.slf4j.Marker;
+import org.slf4j.MarkerFactory;
+import org.thinkingstudio.initialization.EntrypointContexts;
+import org.thinkingstudio.initialization.api.DedicatedServerModInitializer;
+import org.thinkingstudio.initialization.test.neoforge.TestModNeoForge;
+
+@EntryPointProvider(slug = EntrypointContexts.SERVER_INITIALIZER_KEY)
+public class TestModNeoForgeServer implements DedicatedServerModInitializer {
+    private static final Marker MARKER = MarkerFactory.getMarker("DedicatedServer");
+
+    @Override
+    public void onInitializeServer() {
+        TestModNeoForge.LOGGER.error(MARKER, "DedicatedServer ModInitializer is working!");
+    }
+}
diff --git a/testmod-neoforge/src/main/resources/META-INF/neoforge.mods.toml b/testmod-neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -0,0 +1,27 @@
+modLoader = "javafml"
+loaderVersion = "[2,)"
+#issueTrackerURL = ""
+license = "GNU LGPL 3.0"
+
+[[mods]]
+modId = "initialization_test"
+version = "0.1.0"
+displayName = "Initialization Test Mod"
+authors = "TexTrue"
+description = '''
+Common ModInitializer based on Integration.
+'''
+
+[[dependencies.initialization_test]]
+modId = "neoforge"
+type = "required"
+versionRange = "[21,)"
+ordering = "NONE"
+side = "BOTH"
+
+[[dependencies.initialization_test]]
+modId = "minecraft"
+type = "required"
+versionRange = "[1.21,)"
+ordering = "NONE"
+side = "BOTH"
