Client consent screen

.github/workflows/build.yml

@@ -14,7 +14,7 @@ jobs:
         uses: actions/setup-java@v6
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
         with:
@@ -41,7 +41,7 @@ jobs:
         uses: actions/setup-java@v6
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
         with:

.github/workflows/maven-publish.yml

@@ -12,7 +12,7 @@ jobs:
         uses: actions/setup-java@v6
         with:
           distribution: 'temurin'
-          java-version: 21
+          java-version: 25
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@v6
         with:

build.gradle.kts

@@ -1,3 +1,6 @@
+import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
 plugins {
     id("java")
     id("com.gradleup.shadow") version "9.6.1" apply false
@@ -12,6 +15,58 @@ subprojects {
 
     group = "dev.faststats.metrics"
 
+    if (path.startsWith(":fabric:versions:") || path.startsWith(":neoforge:versions:")) {
+        apply { plugin("com.gradleup.shadow") }
+        extra.set("publishComponent", "shadow")
+
+        val bundled = configurations.create("bundled") {
+            isCanBeConsumed = false
+            isTransitive = false
+        }
+        extensions.configure<ShadowExtension> {
+            addShadowVariantIntoJavaComponent = false
+        }
+        tasks.named<ShadowJar>("shadowJar") {
+            configurations = listOf(bundled)
+            duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+            filesMatching("META-INF/services/**") {
+                duplicatesStrategy = DuplicatesStrategy.INCLUDE
+            }
+            mergeServiceFiles()
+            exclude("module-info.class", "META-INF/versions/**/module-info.class")
+            if (project.path.startsWith(":neoforge:")) exclude("fabric.mod.json")
+        }
+        tasks.named("assemble") { dependsOn("shadowJar") }
+        tasks.named<Jar>("jar") {
+            enabled = false
+        }
+
+        afterEvaluate {
+            configurations.named("shadowRuntimeElements") {
+                attributes.attributeProvider(
+                    TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE,
+                    tasks.named<JavaCompile>("compileJava").flatMap { it.options.release }
+                )
+            }
+            val distribution = tasks.named<AbstractArchiveTask>(
+                if (plugins.hasPlugin("net.fabricmc.fabric-loom-remap")) "remapJar" else "shadowJar"
+            )
+            listOf("apiElements", "runtimeElements").forEach { name ->
+                configurations.named(name) {
+                    outgoing.artifacts.clear()
+                    outgoing.variants.clear()
+                    outgoing.artifact(distribution)
+                    exclude(group = "dev.faststats.metrics")
+                }
+            }
+            configurations.findByName("namedElements")?.outgoing?.apply {
+                artifacts.clear()
+                variants.clear()
+                artifact(tasks.named("shadowJar"))
+            }
+        }
+    }
+
     repositories {
         mavenCentral()
     }
@@ -108,7 +163,11 @@ subprojects {
                     }
                 }
 
-                from(components["java"])
+                from(components[ownProperty("publishComponent") ?: "java"])
+                if (ownProperty("publishComponent") == "shadow") {
+                    artifact(tasks.named(if (plugins.hasPlugin("net.fabricmc.fabric-loom-remap")) "remapSourcesJar" else "sourcesJar"))
+                    artifact(tasks.named("javadocJar"))
+                }
             }
 
             repositories {
@@ -141,10 +200,25 @@ tasks.register("checkNeoForgePlatformCompat") {
     dependsOn(platformCompatProjects("neoforge").map { "${it.path}:compileJava" })
 }
 
+tasks.register("checkOnboardingCompat") {
+    group = "verification"
+    description = "Compiles every onboarding band against its own Minecraft version."
+    dependsOn(platformCompatProjects("onboarding").map { "${it.path}:compileJava" })
+}
+
 tasks.register("checkPlatformCompat") {
     group = "verification"
     description = "Compiles all platform compatibility modules."
-    dependsOn(tasks.named("checkFabricPlatformCompat"), tasks.named("checkNeoForgePlatformCompat"))
+    dependsOn("checkFabricPlatformCompat", "checkNeoForgePlatformCompat", "checkOnboardingCompat")
+}
+
+tasks.register("assemblePlatformCompat") {
+    group = "build"
+    description = "Assembles all Fabric and NeoForge distributions, including onboarding."
+    dependsOn(
+        (platformCompatProjects("fabric") + platformCompatProjects("neoforge"))
+            .map { "${it.path}:assemble" }
+    )
 }
 
 tasks.register("publishPlatformCompat") {

config/src/main/java/dev/faststats/config/SimpleConfig.java

@@ -9,7 +9,6 @@
 import org.jspecify.annotations.Nullable;
 
 import java.io.IOException;
-import java.io.OutputStreamWriter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.Properties;
@@ -21,15 +20,7 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 
 @ApiStatus.Internal
-public record SimpleConfig(
-        UUID serverId,
-        boolean enabled,
-        boolean additionalMetrics,
-        boolean debug,
-        boolean submitMetrics,
-        boolean errorTracking,
-        boolean firstRun
-) implements Config {
+public final class SimpleConfig implements Config {
     private static final int CONFIG_VERSION = 3;
 
     private static final String COMMENT = """
@@ -58,7 +49,86 @@
             Learn more at: https://faststats.dev/info
 
             Since this is your first start with FastStats, submission will not start
-            until you restart the server to allow you to opt out if you prefer.""";
+            until after a restart, to allow you to opt out if you prefer.""";
+
+    private final Path file;
+    private final UUID serverId;
+    private final boolean debug;
+    private final boolean firstRun;
+    private volatile boolean additionalMetrics;
+    private volatile boolean enabled;
+    private volatile boolean errorTracking;
+    private volatile boolean submitMetrics;
+
+    public SimpleConfig(
+            final Path file,
+            final UUID serverId,
+            final boolean enabled,
+            final boolean additionalMetrics,
+            final boolean debug,
+            final boolean submitMetrics,
+            final boolean errorTracking,
+            final boolean firstRun
+    ) {
+        this.file = file;
+        this.serverId = serverId;
+        this.enabled = enabled;
+        this.additionalMetrics = additionalMetrics;
+        this.debug = debug;
+        this.submitMetrics = submitMetrics;
+        this.errorTracking = errorTracking;
+        this.firstRun = firstRun;
+    }
+
+    @Override
+    public UUID serverId() {
+        return serverId;
+    }
+
+    @Override
+    public boolean enabled() {
+        return enabled;
+    }
+
+    public void enabled(final boolean enabled) {
+        this.enabled = enabled;
+    }
+
+    @Override
+    public boolean additionalMetrics() {
+        return additionalMetrics;
+    }
+
+    public void additionalMetrics(final boolean additionalMetrics) {
+        this.additionalMetrics = additionalMetrics;
+    }
+
+    @Override
+    public boolean debug() {
+        return debug;
+    }
+
+    @Override
+    public boolean submitMetrics() {
+        return submitMetrics;
+    }
+
+    public void submitMetrics(final boolean submitMetrics) {
+        this.submitMetrics = submitMetrics;
+    }
+
+    @Override
+    public boolean errorTracking() {
+        return errorTracking;
+    }
+
+    public void errorTracking(final boolean errorTracking) {
+        this.errorTracking = errorTracking;
+    }
+
+    public boolean firstRun() {
+        return firstRun;
+    }
 
     @Contract(mutates = "io")
     public static SimpleConfig read(final Path file, final LoggerFactory factory) throws RuntimeException {
@@ -91,8 +161,7 @@
             if (configVersion != null && configVersion < CONFIG_VERSION)
                 logger.info("Updating config version from %s to %s", configVersion, CONFIG_VERSION);
             Files.createDirectories(file.getParent());
-            try (final var out = Files.newOutputStream(file);
-                 final var writer = new OutputStreamWriter(out, UTF_8)) {
+            try (final var writer = Files.newBufferedWriter(file, UTF_8)) {
                 final var store = new Properties();
 
                 store.setProperty("enabled", Boolean.toString(enabled));
@@ -112,6 +181,7 @@
         }
 
         return new SimpleConfig(
+                file,
                 serverId,
                 enabled && enabledFlag,
                 enabled && enabledFlag && additionalMetrics,
@@ -122,6 +192,23 @@
         );
     }
 
+    @Contract(mutates = "io")
+    public void persist() throws RuntimeException {
+        final var properties = readOrEmpty(file);
+        if (properties == null) throw new IllegalStateException("Metrics config has not been initialized");
+
+        properties.setProperty("enabled", Boolean.toString(enabled()));
+        properties.setProperty("submitAdditionalMetrics", Boolean.toString(additionalMetrics()));
+        properties.setProperty("submitErrors", Boolean.toString(errorTracking()));
+        properties.setProperty("submitMetrics", Boolean.toString(submitMetrics()));
+
+        try (final var writer = Files.newBufferedWriter(file, UTF_8)) {
+            properties.store(writer, COMMENT);
+        } catch (final IOException e) {
+            throw new RuntimeException("Failed to save metrics config", e);
+        }
+    }
+
     // fixme: this code sucks ass
     @Contract(value = "_, _, _, !null, _, _-> !null")
     private static <T> @Nullable T parse(
@@ -180,4 +267,17 @@
         }
         return true;
     }
+
+    @Override
+    public String toString() {
+        return "SimpleConfig{" +
+                "serverId=" + serverId +
+                ", debug=" + debug +
+                ", firstRun=" + firstRun +
+                ", additionalMetrics=" + additionalMetrics +
+                ", enabled=" + enabled +
+                ", errorTracking=" + errorTracking +
+                ", submitMetrics=" + submitMetrics +
+                '}';
+    }
 }

core/src/main/java/dev/faststats/Metrics.java

@@ -3,12 +3,18 @@
 import dev.faststats.data.Metric;
 import org.jetbrains.annotations.Contract;
 
+import java.util.stream.Stream;
+
 /**
  * Metrics interface.
  *
  * @since 0.24.0
  */
 public interface Metrics {
+    // todo: document
+    @Contract(pure = true)
+    Stream<Metric<?>> stream();
+
     /**
      * A metrics factory.
      *

core/src/main/java/dev/faststats/SimpleContext.java

@@ -12,9 +12,11 @@
 import java.util.HashSet;
 import java.util.Optional;
 import java.util.Properties;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 
+// todo: revise
 public non-sealed abstract class SimpleContext implements FastStatsContext {
     private final @Token String token;
     private final Config config;
@@ -24,6 +26,7 @@ public non-sealed abstract class SimpleContext implements FastStatsContext {
     private final Logger logger;
 
     protected volatile boolean ready = false;
+    public volatile boolean submissionActive;
 
     private @Nullable Metrics metrics;
     private @Nullable FeatureFlagService featureFlagService;
@@ -56,14 +59,33 @@ protected SimpleContext(final Factory<?, ?> factory, final LoggerFactory loggerF
 
     @MustBeInvokedByOverriders
     protected final void initializeServices(final Factory<?, ?> factory) throws IllegalStateException {
+        initializeServices(factory, false);
+    }
+
+    /**
+     * Initializes service descriptions before consent so this context can participate in a live lifecycle registry.
+     */
+    @MustBeInvokedByOverriders
+    protected final void initializeManagedServices(final Factory<?, ?> factory) throws IllegalStateException {
+        initializeServices(factory, true);
+    }
+
+    private void initializeServices(final Factory<?, ?> factory, final boolean lifecycleManaged) {
         if (factory.metrics == null && factory.errorTracker == null && factory.featureFlagService == null)
             throw new IllegalStateException("Context created without any service attached, was this intentional?");
 
-        if (!preSubmissionStart()) return;
+        final var start = preSubmissionStart();
+        if (!lifecycleManaged && !start) return;
 
-        this.metrics = config.submitMetrics() && factory.metrics != null ? factory.metrics.apply(metricsFactory()) : null;
-        this.errorTrackerService = config.errorTracking() && factory.errorTracker != null ? new SimpleErrorTrackerService(this, factory.errorTracker) : null;
+        if (factory.metrics != null && (lifecycleManaged || config.submitMetrics())) {
+            final var metricsFactory = metricsFactory();
+            this.metrics = factory.metrics.apply(metricsFactory);
+        }
+        this.errorTrackerService = factory.errorTracker != null && (lifecycleManaged || config.errorTracking())
+                ? new SimpleErrorTrackerService(this, factory.errorTracker)
+                : null;
         this.featureFlagService = factory.featureFlagService != null ? factory.featureFlagService.apply(new SimpleFeatureFlagService.Factory(this)) : null;
+        this.submissionActive = start;
 
         final var features = new HashSet<String>(3);
         features.add("metrics=" + (metrics != null ? "yes" : "no"));
@@ -161,6 +183,7 @@ public void shutdown() {
         if (errorTrackerService != null) errorTrackerService.shutdown();
         if (featureFlagService instanceof final SimpleFeatureFlagService service) service.shutdown();
         if (metrics instanceof final SimpleMetrics simpleMetrics) simpleMetrics.shutdown();
+        this.submissionActive = false;
         ready = false;
     }