feat(mod-loaders): complete neoforge for 26.x, drop forge/quilt, fix fabric metrics

build.gradle.kts

@@ -8,16 +8,12 @@ val javaVersionsOverride = mapOf(
     ":bukkit:example-plugin" to 21,
     ":fabric" to 25,
     ":fabric:example-mod" to 25,
-    ":forge" to 21,
-    ":forge:example-mod" to 21,
     ":hytale" to 25,
     ":hytale:example-plugin" to 25,
     ":minestom" to 25,
     ":minestom:example-server" to 25,
-    ":neoforge" to 21,
-    ":neoforge:example-mod" to 21,
-    ":quilt" to 25,
-    ":quilt:example-mod" to 25,
+    ":neoforge" to 25,
+    ":neoforge:example-mod" to 25,
     ":velocity" to 21,
     ":velocity:example-plugin" to 21
 )
@@ -31,7 +27,7 @@ subprojects {
 
     val example = project.name.startsWith("example")
     if (example) {
-        if (project.path != ":fabric:example-mod") {
+        if (project.path != ":fabric:example-mod" && project.path != ":neoforge:example-mod") {
             apply { plugin("com.gradleup.shadow") }
         }
     } else {

fabric/src/main/java/dev/faststats/fabric/FabricContext.java

@@ -41,7 +41,7 @@ private FabricContext(final Factory factory, final String modId, @Token final St
         switch (FabricLoader.getInstance().getEnvironmentType()) {
             case CLIENT -> {
                 ready();
-                ClientLifecycleEvents.CLIENT_STARTED.register(client -> shutdown());
+                ClientLifecycleEvents.CLIENT_STOPPING.register(client -> shutdown());
             }
             case SERVER -> {
                 ServerLifecycleEvents.SERVER_STARTED.register(server -> ready());

fabric/src/main/java/dev/faststats/fabric/FabricMetrics.java

@@ -15,13 +15,22 @@ protected FabricMetrics(final Factory factory, final ModContainer mod) throws Il
 
     protected void appendFabricData(final JsonObject metrics, final String serverType) {
         metrics.addProperty("minecraft_version", minecraftVersion());
+        metrics.addProperty("platform_version", platformVersion());
         metrics.addProperty("plugin_version", mod.getMetadata().getVersion().getFriendlyString());
         metrics.addProperty("server_type", serverType);
     }
 
     protected static String minecraftVersion() {
+        return version("minecraft");
+    }
+
+    protected static String platformVersion() {
+        return version("fabricloader");
+    }
+
+    private static String version(final String modId) {
         return FabricLoader.getInstance()
-                .getModContainer("minecraft")
+                .getModContainer(modId)
                 .map(container -> container.getMetadata().getVersion().getFriendlyString())
                 .orElse("unknown");
     }

gradle.properties

@@ -1,2 +1,2 @@
-version=0.26.1
+version=0.26.2
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m

neoforge/build.gradle.kts

@@ -1,12 +1,19 @@
 val moduleName by extra("dev.faststats.neoforge")
 
-repositories {
-    maven("https://maven.neoforged.net/releases")
-    maven("https://libraries.minecraft.net/")
+plugins {
+    id("net.neoforged.moddev") version "2.0.141"
+}
+
+neoForge {
+    version = "26.1.2.76"
+}
+
+configurations.configureEach {
+    resolutionStrategy.force("com.google.code.gson:gson:2.13.2")
 }
 
 dependencies {
     api(project(":core"))
     implementation(project(":config"))
-    compileOnly("net.neoforged.fancymodloader:loader:10.0.36")
+    compileOnly("net.neoforged:bus:8.0.5")
 }

neoforge/example-mod/build.gradle.kts

@@ -1,11 +1,17 @@
-repositories {
-    maven("https://maven.neoforged.net/releases")
-    maven("https://libraries.minecraft.net/")
+plugins {
+    id("net.neoforged.moddev") version "2.0.141"
+}
+
+neoForge {
+    version = "26.1.2.76"
+}
+
+configurations.configureEach {
+    resolutionStrategy.force("com.google.code.gson:gson:2.13.2")
 }
 
 dependencies {
     implementation(project(":neoforge"))
-    compileOnly("net.neoforged.fancymodloader:loader:10.0.36")
 }
 
 tasks.jar {

neoforge/src/main/java/dev/faststats/neoforge/NeoForgeContext.java

@@ -2,10 +2,15 @@
 
 import dev.faststats.Metrics;
 import dev.faststats.SimpleContext;
+import dev.faststats.SimpleMetrics;
 import dev.faststats.Token;
 import dev.faststats.config.SimpleConfig;
 import net.neoforged.fml.ModList;
+import net.neoforged.fml.loading.FMLEnvironment;
 import net.neoforged.fml.loading.FMLPaths;
+import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.server.ServerStartedEvent;
+import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 import net.neoforged.neoforgespi.language.IModInfo;
 import org.jetbrains.annotations.Contract;
 
@@ -19,7 +24,7 @@
 /**
  * NeoForge FastStats context.
  *
- * @since 0.25.2
+ * @since 0.26.2
  */
 public final class NeoForgeContext extends SimpleContext {
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(runnable -> {
@@ -32,17 +37,31 @@ public final class NeoForgeContext extends SimpleContext {
 
     private NeoForgeContext(final Factory factory, final String modId, @Token final String token) {
         super(factory, SimpleConfig.read(FMLPaths.CONFIGDIR.get().resolve("faststats").resolve("config.properties")), "neoforge", token);
-        this.mod = ModList.get().getModFileById(modId).getMods().stream().filter(mod -> mod.getModId().equals(modId)).findFirst().orElseThrow(() -> {
+        this.mod = ModList.get().getModContainerById(modId).map(container -> container.getModInfo()).orElseThrow(() -> {
             return new IllegalArgumentException("Mod not found: " + modId);
         });
         initializeServices(factory);
+        switch (FMLEnvironment.getDist()) {
+            case CLIENT -> ready();
+            case DEDICATED_SERVER -> {
+                NeoForge.EVENT_BUS.addListener((final ServerStartedEvent event) -> ready());
+                NeoForge.EVENT_BUS.addListener((final ServerStoppingEvent event) -> shutdown());
+            }
+        }
     }
 
     @Override
     @Contract(value = " -> new", pure = true)
     protected Metrics.Factory metricsFactory() {
-        // todo: proper client/server support
-        return new NeoForgeMetrics.Factory(this, mod);
+        return new SimpleMetrics.Factory(this) {
+            @Override
+            public Metrics create() throws IllegalStateException {
+                return switch (FMLEnvironment.getDist()) {
+                    case CLIENT -> new NeoForgeMetricsClient(this, mod);
+                    case DEDICATED_SERVER -> new NeoForgeMetricsServer(this, mod);
+                };
+            }
+        };
     }
 
     @Override