Add modrinth analytics

Author: DeDiamondPro

changelog.md

@@ -1,11 +1,12 @@
-## Resourcify 1.8.2
+## Resourcify 1.8.3
 
 Please make sure to report any bugs and/or visual anomalies
 on [Resourcify's GitHub](https://github.com/DeDiamondPro/Resourcify/issues) or in
 the [Discord](https://dediamondpro.dev/discord).
 
-- Port to 26.1 fabric
-- Fixed cancel button offset in screen when downloading a world.
+- Resourcify now contributes to Modrinth's analytics,
+  see [their article](https://modrinth.com/news/article/analytics-overhaul/) for more info.
+- Ported to 26.1.2 NeoForge
 
 ----------------------------------------------------------------------------------------------------
 

gradle.properties

@@ -1,6 +1,6 @@
 mod_name = Resourcify
 mod_id = resourcify
-mod_version = 1.8.2
+mod_version = 1.8.3
 
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=true

src/main/kotlin/dev/dediamondpro/resourcify/gui/projectpage/VersionWrapper.kt

@@ -1,3 +1,20 @@
+/*
+ * This file is part of Resourcify
+ * Copyright (C) 2026 DeDiamondPro
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License Version 3 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package dev.dediamondpro.resourcify.gui.projectpage
 
 import dev.dediamondpro.resourcify.Constants
@@ -7,6 +24,7 @@ import dev.dediamondpro.resourcify.gui.PaginatedScreen
 import dev.dediamondpro.resourcify.gui.world.WorldDownloadingScreen
 import dev.dediamondpro.resourcify.services.IVersion
 import dev.dediamondpro.resourcify.services.ProjectType
+import dev.dediamondpro.resourcify.services.modrinth.ModrinthAnalytics
 import dev.dediamondpro.resourcify.util.DownloadManager
 import dev.dediamondpro.resourcify.util.Utils
 import dev.dediamondpro.resourcify.util.localize
@@ -97,7 +115,11 @@ class VersionWrapper(private val version: IVersion, private val type: ProjectTyp
             while (file.exists()) {
                 file = File(downloadFolder, Utils.incrementFileName(file.name))
             }
-            DownloadManager.download(file, version.getSha1(), url, type.shouldExtract) {
+            DownloadManager.download(
+                file, version.getSha1(),
+                url, type.shouldExtract,
+                ModrinthAnalytics.DownloadReason.STANDALONE
+            ) {
                 text?.setText("${ChatColor.BOLD}${localize("resourcify.version.installed")}")
                 installed = true
             }

src/main/kotlin/dev/dediamondpro/resourcify/gui/update/components/UpdateCard.kt

@@ -32,6 +32,7 @@ import dev.dediamondpro.resourcify.gui.PaginatedScreen
 import dev.dediamondpro.resourcify.gui.data.Colors
 import dev.dediamondpro.resourcify.gui.data.Icons
 import dev.dediamondpro.resourcify.mixins.PackScreenAccessor
+import dev.dediamondpro.resourcify.services.modrinth.ModrinthAnalytics
 import dev.dediamondpro.resourcify.util.*
 import gg.essential.elementa.UIComponent
 import gg.essential.elementa.components.UIBlock
@@ -239,8 +240,8 @@ class UpdateCard(
                 downloadFile = File(file.parentFile, Utils.incrementFileName(downloadFile.name))
             }
             DownloadManager.download(
-                downloadFile,
-                newVersion.getSha1(), updateUrl
+                downloadFile, newVersion.getSha1(), updateUrl,
+                downloadReason = ModrinthAnalytics.DownloadReason.UPDATE
             ) {
                 try {
                     // Try to update the pack if it is currently selected, not critical if it fails

src/main/kotlin/dev/dediamondpro/resourcify/gui/world/DownloadWorldTab.kt

@@ -28,10 +28,10 @@ import net.minecraft.network.chat.Component
 import java.util.function.Consumer
 
 //?if >=26.2 {
-import net.minecraft.client.gui.layouts.Layout
+/*import net.minecraft.client.gui.layouts.Layout
 import net.minecraft.client.gui.layouts.LinearLayout
 
-//?}
+*///?}
 
 class DownloadWorldTab : Tab {
     override fun getTabTitle(): Component {
@@ -51,12 +51,12 @@ class DownloadWorldTab : Tab {
     }
 
     //?if >=26.2 {
-    val layout: LinearLayout = LinearLayout.vertical()
+    /*val layout: LinearLayout = LinearLayout.vertical()
 
     override fun getLayout(): Layout {
         return layout
     }
-    //?}
+    *///?}
 
     fun onClick() {
         UScreen.displayScreen(BrowseScreen(ProjectType.WORLD, Platform.getFileInGameDir("saves")))

src/main/kotlin/dev/dediamondpro/resourcify/handlers/VulkanHandler.kt

@@ -21,17 +21,17 @@ import gg.essential.universal.UScreen
 import net.minecraft.client.gui.screens.Screen
 
 //?if >=26.2 {
-import com.mojang.blaze3d.vulkan.VulkanBackend
+/*import com.mojang.blaze3d.vulkan.VulkanBackend
 import net.minecraft.client.Minecraft
 import net.minecraft.client.gui.screens.AlertScreen
 import net.minecraft.network.chat.Component
 
-//?}
+*///?}
 
 object VulkanHandler {
     inline fun runOrBlock(callable: () -> Unit) {
         //?if >=26.2 {
-        val mc = Minecraft.getInstance()
+        /*val mc = Minecraft.getInstance()
         if (mc.window.backend() is VulkanBackend) {
             val currentScreen = mc.gui.screen()
             mc.setScreenAndShow(
@@ -43,13 +43,13 @@ object VulkanHandler {
             )
             return
         }
-        //?}
+        *///?}
         callable.invoke()
     }
 
     inline fun createOrBlock(callable: () -> Screen): Screen {
         //?if >=26.2 {
-        val mc = Minecraft.getInstance()
+        /*val mc = Minecraft.getInstance()
         if (mc.window.backend() is VulkanBackend) {
             val currentScreen = mc.gui.screen()
             return AlertScreen(
@@ -58,7 +58,7 @@ object VulkanHandler {
                 Component.translatable("resourcify.no-vulkan.description")
             )
         }
-        //?}
+        *///?}
         return callable.invoke()
     }
 }

src/main/kotlin/dev/dediamondpro/resourcify/services/modrinth/ModrinthAnalytics.kt

@@ -0,0 +1,37 @@
+/*
+ * This file is part of Resourcify
+ * Copyright (C) 2026 DeDiamondPro
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License Version 3 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package dev.dediamondpro.resourcify.services.modrinth
+
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Data to contribute to Modrinth's analytics,
+ * see https://modrinth.com/news/article/analytics-overhaul/ (bottom of article)
+ */
+data class ModrinthAnalytics(
+    @SerializedName("download_reason") val downloadReason: DownloadReason? = null,
+    @SerializedName("game_version") val gameVersion: String? = null,
+    @SerializedName("loader") val loader: String? = null,
+) {
+    enum class DownloadReason {
+        @SerializedName("standalone") STANDALONE,
+        @SerializedName("dependency") DEPENDENCY,
+        @SerializedName("modpack") MODPACK,
+        @SerializedName("update") UPDATE,
+    }
+}

src/main/kotlin/dev/dediamondpro/resourcify/util/DownloadManager.kt

@@ -1,6 +1,6 @@
 /*
  * This file is part of Resourcify
- * Copyright (C) 2023-2024 DeDiamondPro
+ * Copyright (C) 2023-2026 DeDiamondPro
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -19,6 +19,7 @@ package dev.dediamondpro.resourcify.util
 
 import dev.dediamondpro.resourcify.Constants
 import dev.dediamondpro.resourcify.platform.Platform
+import dev.dediamondpro.resourcify.services.modrinth.ModrinthAnalytics
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry
 import org.apache.commons.compress.archivers.zip.ZipFile
 import java.io.File
@@ -39,9 +40,11 @@ object DownloadManager {
 
     fun download(
         file: File, sha512: String? = null, uri: URI,
-        extract: Boolean = false, callback: (() -> Unit)? = null,
+        extract: Boolean = false,
+        downloadReason: ModrinthAnalytics.DownloadReason? = null,
+        callback: (() -> Unit)? = null,
     ) {
-        queuedDownloads[uri] = QueuedDownload(file, sha512, extract, callback)
+        queuedDownloads[uri] = QueuedDownload(file, sha512, extract, callback, downloadReason)
         downloadNext()
     }
 
@@ -74,7 +77,17 @@ object DownloadManager {
             tempFile = File(tempFolder, queuedDownload.file.name + "-$i.tmp")
         }
         downloadsInProgress[url] = DownloadData(runAsync {
-            val con = url.toURL().setupConnection()
+            // Modrinth analytics
+            val headers = mutableMapOf<String, String>()
+            if (url.host == "cdn.modrinth.com") {
+                headers["modrinth-download-meta"] = ModrinthAnalytics(
+                    downloadReason = queuedDownload.downloadReason,
+                    gameVersion = Platform.getMcVersion(),
+                    loader = Platform.getLoader(),
+                ).toJson()
+            }
+
+            val con = url.toURL().setupConnection(headers)
             downloadsInProgress[url]?.length = con.contentLength
             con.getEncodedInputStream().use {
                 Files.copy(it!!, tempFile.toPath(), StandardCopyOption.REPLACE_EXISTING)
@@ -172,6 +185,12 @@ object DownloadManager {
     }
 }
 
-private data class QueuedDownload(val file: File, val sha1: String?, val extract: Boolean, val callback: (() -> Unit)?)
+private data class QueuedDownload(
+    val file: File,
+    val sha1: String?,
+    val extract: Boolean,
+    val callback: (() -> Unit)?,
+    val downloadReason: ModrinthAnalytics.DownloadReason?
+)
 
 private data class DownloadData(val future: CompletableFuture<Void>, val file: File, var length: Int? = null)

src/main/kotlin/dev/dediamondpro/resourcify/util/NetworkUtil.kt

@@ -36,12 +36,15 @@ object NetworkUtil {
     private val cache = ConcurrentHashMap<URI, CacheObject>()
     private val currentlyFetching = ConcurrentHashMap<URI, CompletableFuture<ByteArray?>>()
 
-    fun setupConnection(url: URL): HttpsURLConnection {
+    fun setupConnection(url: URL, headers: Map<String, String> = emptyMap()): HttpsURLConnection {
         val con = url.openConnection() as HttpsURLConnection
         con.setRequestProperty(
             "User-Agent",
             "${Constants.NAME}/${Constants.VERSION} (${Platform.getMcVersion()}-${Platform.getLoader()})"
         )
+        for ((key, value) in headers) {
+            con.setRequestProperty(key, URLEncoder.encode(value, "UTF-8"))
+        }
         con.setRequestProperty("Accept-Encoding", "gzip, deflate")
         con.connectTimeout = 5000
         con.readTimeout = 5000
@@ -129,7 +132,8 @@ object NetworkUtil {
     }
 }
 
-fun URL.setupConnection(): HttpsURLConnection = NetworkUtil.setupConnection(this)
+fun URL.setupConnection(headers: Map<String, String> = emptyMap()): HttpsURLConnection =
+    NetworkUtil.setupConnection(this, headers)
 
 fun URLConnection.getEncodedInputStream(): InputStream? {
     return try {

stonecutter.gradle.kts

@@ -19,7 +19,7 @@ plugins {
     id("dev.kikugie.stonecutter")
     alias(libs.plugins.arch.loom) apply false
 }
-stonecutter active "26.2-fabric" /* [SC] DO NOT EDIT */
+stonecutter active "26.1.2-fabric" /* [SC] DO NOT EDIT */
 
 stonecutter tasks {
     val ordering = versionComparator.thenComparingInt {