Use JIJ (jar-in-jar) over shading for modded platforms

fabric/build.gradle.kts

@@ -14,6 +14,12 @@ configurations.compileClasspath {
     attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
 }
 
+tasks.processResources {
+    filesMatching("fabric.mods.json") {
+        expand("version" to project.version)
+    }
+}
+
 allprojects {
     if (project.name == "example-mod") return@allprojects
     if (project.path == ":fabric:versions") return@allprojects
@@ -22,9 +28,24 @@ allprojects {
     extra.set("publishDocsUrl", "https://docs.faststats.dev/java/platform/fabric")
 }
 
+subprojects {
+    if (project.name == "example-mod") return@subprojects
+
+    dependencies {
+        compileOnlyApi(project(":fabric"))
+    }
+
+    tasks.jar {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        from(project(":fabric").sourceSets["main"].output)
+        from(project(":config").sourceSets["main"].output)
+        from(project(":core").sourceSets["main"].output)
+    }
+}
+
 dependencies {
-    api(project(":core"))
-    implementation(project(":config"))
+    compileOnlyApi(project(":core"))
+    compileOnly(project(":config"))
     minecraft("com.mojang:minecraft:26.1.2")
     compileOnly("net.fabricmc.fabric-api:fabric-api:0.150.0+26.1.2")
     compileOnly("net.fabricmc:fabric-loader:0.19.3")

fabric/example-mod/build.gradle.kts

@@ -10,16 +10,8 @@ tasks.compileJava {
 }
 
 dependencies {
-    implementation(project(":fabric:versions:26.1-26.3"))
-    minecraft("com.mojang:minecraft:26.1.2")
-    implementation("net.fabricmc.fabric-api:fabric-api:0.150.0+26.1.2")
     compileOnly("net.fabricmc:fabric-loader:0.19.3")
-}
-
-tasks.jar {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    from(project(":config").sourceSets["main"].output)
-    from(project(":core").sourceSets["main"].output)
-    from(project(":fabric").sourceSets["main"].output)
-    from(project(":fabric:versions:26.1-26.3").sourceSets["main"].output)
+    compileOnly(project(":fabric:versions:26.1-26.3"))
+    include(project(":fabric:versions:26.1-26.3"))
+    minecraft("com.mojang:minecraft:26.2")
 }

fabric/example-mod/src/main/resources/example-mod.mixins.json

@@ -0,0 +1,11 @@
+{
+  "required": true,
+  "package": "com.example.mixin",
+  "compatibilityLevel": "JAVA_25",
+  "client": [
+    "OnboardingScreen"
+  ],
+  "injectors": {
+    "defaultRequire": 1
+  }
+}

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

@@ -12,6 +12,9 @@
       "com.example.ExampleMod"
     ]
   },
+  "mixins": [
+    "example-mod.mixins.json"
+  ],
   "depends": {
     "fabricloader": ">=0.18.4",
     "minecraft": "*",

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

@@ -0,0 +1,24 @@
+{
+  "schemaVersion": 1,
+  "id": "faststats",
+  "version": "$version",
+  "name": "FastStats",
+  "description": "Analytics for developers",
+  "contact": {
+    "email": "mail@faststats.dev",
+    "homepage": "https://faststats.dev/mods",
+    "sources": "https://github.com/faststats-dev/faststats-java",
+    "issues": "https://github.com/faststats-dev/faststats-java/issues"
+  },
+  "icon": "faststats.png",
+  "license": "MIT",
+  "authors": [
+    "David | NonSwag"
+  ],
+  "environment": "*",
+  "depends": {
+    "fabricloader": ">=0.18.4",
+    "minecraft": "*",
+    "fabric-api": "*"
+  }
+}

fabric/src/main/resources/faststats.png

@@ -0,0 +1 @@
+../../../../assets/faststats.png

fabric/versions/1.16.1-1.17.1/build.gradle.kts

@@ -12,10 +12,6 @@ tasks.compileJava {
 }
 
 dependencies {
-    api(project(":fabric"))
-    api(project(":core"))
-    implementation(project(":config"))
-
     // minecraft("com.mojang:minecraft:1.16.1")
     // minecraft("com.mojang:minecraft:1.16.2")
     // minecraft("com.mojang:minecraft:1.16.3")

fabric/versions/1.16.1-1.17.1/src/main/java/module-info.java

@@ -2,7 +2,9 @@
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 module dev.faststats.fabric.compat.v1_16_1 {
+    exports dev.faststats.fabric.compat.v1_16_1;
+
     requires dev.faststats.fabric;
 
     requires static org.jspecify;

fabric/versions/1.18-1.21.8/build.gradle.kts

@@ -12,10 +12,6 @@ tasks.compileJava {
 }
 
 dependencies {
-    api(project(":fabric"))
-    api(project(":core"))
-    implementation(project(":config"))
-
     // minecraft("com.mojang:minecraft:1.18")
     // minecraft("com.mojang:minecraft:1.18.1")
     // minecraft("com.mojang:minecraft:1.18.2")

fabric/versions/1.18-1.21.8/src/main/java/module-info.java

@@ -2,7 +2,9 @@
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 module dev.faststats.fabric.compat.v1_18 {
+    exports dev.faststats.fabric.compat.v1_18;
+
     requires dev.faststats.fabric;
 
     requires static org.jspecify;

fabric/versions/1.21.9-1.21.11/build.gradle.kts

@@ -5,17 +5,13 @@ plugins {
     id("net.fabricmc.fabric-loom-remap")
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(25)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 tasks.compileJava {
-    options.release.set(25)
+    options.release.set(21)
 }
 
 dependencies {
-    api(project(":fabric"))
-    api(project(":core"))
-    implementation(project(":config"))
-
     // minecraft("com.mojang:minecraft:1.21.9")
     // minecraft("com.mojang:minecraft:1.21.10")
     minecraft("com.mojang:minecraft:1.21.11")

fabric/versions/1.21.9-1.21.11/src/main/java/module-info.java

@@ -2,7 +2,9 @@
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 module dev.faststats.fabric.compat.v1_21_9 {
+    exports dev.faststats.fabric.compat.v1_21_9;
+
     requires dev.faststats.fabric;
 
     requires static org.jspecify;

fabric/versions/26.1-26.3/build.gradle.kts

@@ -12,10 +12,6 @@ tasks.compileJava {
 }
 
 dependencies {
-    api(project(":fabric"))
-    api(project(":core"))
-    implementation(project(":config"))
-
     // minecraft("com.mojang:minecraft:26.1")
     // minecraft("com.mojang:minecraft:26.1.1")
     // minecraft("com.mojang:minecraft:26.1.2")

fabric/versions/26.1-26.3/src/main/java/module-info.java

@@ -2,7 +2,9 @@
 import org.jspecify.annotations.NullMarked;
 
 @NullMarked
 module dev.faststats.fabric.compat.v26_1 {
+    exports dev.faststats.fabric.compat.v26_1;
+
     requires dev.faststats.fabric;
 
     requires static org.jspecify;

gradle.properties

@@ -1,2 +1,2 @@
-version=0.27.2
+version=0.27.3-pre2
 org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m

neoforge/build.gradle.kts

@@ -18,6 +18,12 @@ configurations.runtimeClasspath {
     attributes.attribute(TargetJvmVersion.TARGET_JVM_VERSION_ATTRIBUTE, 25)
 }
 
+tasks.processResources {
+    filesMatching("META-INF/neoforge.mods.toml") {
+        expand("version" to project.version)
+    }
+}
+
 allprojects {
     if (project.name == "example-mod") return@allprojects
     if (project.path == ":neoforge:versions") return@allprojects
@@ -26,6 +32,24 @@ allprojects {
     extra.set("publishDocsUrl", "https://docs.faststats.dev/java/platform/neoforge")
 }
 
+subprojects {
+    if (project.name == "example-mod") return@subprojects
+
+    apply { plugin("net.neoforged.moddev") }
+
+    dependencies {
+        compileOnly("net.neoforged:bus:8.0.5")
+        compileOnlyApi(project(":neoforge"))
+    }
+
+    tasks.jar {
+        duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+        from(project(":neoforge").sourceSets["main"].output)
+        from(project(":config").sourceSets["main"].output)
+        from(project(":core").sourceSets["main"].output)
+    }
+}
+
 neoForge {
     version = "21.8.53" // lowest bound, 1.20.6
 }
@@ -35,7 +59,13 @@ configurations.configureEach {
 }
 
 dependencies {
-    api(project(":core"))
-    implementation(project(":config"))
+    compileOnlyApi(project(":core"))
+    compileOnly(project(":config"))
     compileOnly("net.neoforged:bus:8.0.5")
 }
+
+tasks.jar {
+    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
+    from(project(":config").sourceSets["main"].output)
+    from(project(":core").sourceSets["main"].output)
+}

neoforge/example-mod/build.gradle.kts

@@ -1,6 +1,6 @@
 plugins {
     id("net.neoforged.moddev") version "2.0.141"
-    kotlin("jvm")
+    //kotlin("jvm")
 }
 
 neoForge {
@@ -12,13 +12,6 @@ configurations.configureEach {
 }
 
 dependencies {
-    implementation(project(":neoforge:versions:26.1-26.2"))
-}
-
-tasks.jar {
-    duplicatesStrategy = DuplicatesStrategy.EXCLUDE
-    from(project(":config").sourceSets["main"].output)
-    from(project(":core").sourceSets["main"].output)
-    from(project(":neoforge").sourceSets["main"].output)
-    from(project(":neoforge:versions:26.1-26.2").sourceSets["main"].output)
+    compileOnly(project(":neoforge:versions:26.1-26.2"))
+    jarJar(project(":neoforge:versions:26.1-26.2"))
 }

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -0,0 +1,13 @@
+modLoader = "javafml"
+loaderVersion = "[1,)"
+license = "MIT"
+issueTrackerURL = "https://github.com/faststats-dev/faststats-java/issues"
+
+[[mods]]
+modId = "faststats"
+version = "${version}"
+displayName = "FastStats"
+description = "Analytics for developers"
+logoFile = "faststats.png"
+authors = "David | NonSwag"
+displayURL = "https://faststats.dev/mods"

neoforge/src/main/resources/faststats.png

@@ -0,0 +1 @@
+../../../../assets/faststats.png

neoforge/versions/1.20.6-1.21.8/build.gradle.kts

@@ -1,14 +1,10 @@
 extra.set("moduleName", "dev.faststats.neoforge.compat.v1_20_6")
-extra.set("publishVersionSuffix", "mc1.21-1.21.11")
+extra.set("publishVersionSuffix", "mc1.20.6-1.21.8")
 
-plugins {
-    id("net.neoforged.moddev")
-}
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(25)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 tasks.compileJava {
-    options.release.set(25)
+    options.release.set(21)
 }
 
 neoForge {
@@ -27,10 +23,3 @@ neoForge {
 configurations.configureEach {
     resolutionStrategy.force("com.google.code.gson:gson:2.14.0")
 }
-
-dependencies {
-    api(project(":neoforge"))
-    api(project(":core"))
-    implementation(project(":config"))
-    compileOnly("net.neoforged:bus:8.0.5")
-}

neoforge/versions/1.21.9-1.21.11/build.gradle.kts

@@ -1,14 +1,10 @@
 extra.set("moduleName", "dev.faststats.neoforge.compat.v1_21_9")
 extra.set("publishVersionSuffix", "mc1.21.9-1.21.11")
 
-plugins {
-    id("net.neoforged.moddev")
-}
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(25)
+java.toolchain.languageVersion = JavaLanguageVersion.of(21)
 
 tasks.compileJava {
-    options.release.set(25)
+    options.release.set(21)
 }
 
 neoForge {
@@ -20,10 +16,3 @@ neoForge {
 configurations.configureEach {
     resolutionStrategy.force("com.google.code.gson:gson:2.14.0")
 }
-
-dependencies {
-    api(project(":neoforge"))
-    api(project(":core"))
-    implementation(project(":config"))
-    compileOnly("net.neoforged:bus:8.0.5")
-}

neoforge/versions/26.1-26.2/build.gradle.kts

@@ -1,10 +1,6 @@
 extra.set("moduleName", "dev.faststats.neoforge.compat.v26_1")
 extra.set("publishVersionSuffix", "mc26.1-26.2")
 
-plugins {
-    id("net.neoforged.moddev")
-}
-
 java.toolchain.languageVersion = JavaLanguageVersion.of(25)
 
 tasks.compileJava {
@@ -21,10 +17,3 @@ neoForge {
 configurations.configureEach {
     resolutionStrategy.force("com.google.code.gson:gson:2.14.0")
 }
-
-dependencies {
-    api(project(":neoforge"))
-    api(project(":core"))
-    implementation(project(":config"))
-    compileOnly("net.neoforged:bus:8.0.5")
-}

velocity/src/main/java/module-info.java

@@ -9,6 +9,7 @@
     requires com.velocitypowered.api;
     requires dev.faststats.config;
     requires dev.faststats;
+    requires net.kyori.adventure.api;
     requires org.slf4j;
 
     requires static org.jetbrains.annotations;